From 90e93917009d59a8a8ed18acace042798b2e1b44 Mon Sep 17 00:00:00 2001 From: AXVIII3 <76608488+AXVIII3@users.noreply.github.com> Date: Mon, 10 Apr 2023 21:43:18 +0530 Subject: [PATCH 01/26] Music Looping fixed anf I am still trying to fix rebind save --- Assets/Temp Music/awesomeness.wav.import | 2 +- .../Temp Music/omw-to-beat-the-big-bad.wav.import | 2 +- Scripts/SaveSystem/GameDataSaver.gd | 4 ++++ Scripts/SaveSystem/GlobalSettings.gd | 13 +++++++++++++ Scripts/UI/MainMenuManager.gd | 1 + Scripts/UI/Remaping/RemapController.gd | 4 +++- project.godot | 10 +--------- 7 files changed, 24 insertions(+), 12 deletions(-) diff --git a/Assets/Temp Music/awesomeness.wav.import b/Assets/Temp Music/awesomeness.wav.import index ef0f2c9..e423fd2 100644 --- a/Assets/Temp Music/awesomeness.wav.import +++ b/Assets/Temp Music/awesomeness.wav.import @@ -18,7 +18,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop_mode=0 +edit/loop_mode=2 edit/loop_begin=0 edit/loop_end=-1 compress/mode=0 diff --git a/Assets/Temp Music/omw-to-beat-the-big-bad.wav.import b/Assets/Temp Music/omw-to-beat-the-big-bad.wav.import index 87f4127..e00b910 100644 --- a/Assets/Temp Music/omw-to-beat-the-big-bad.wav.import +++ b/Assets/Temp Music/omw-to-beat-the-big-bad.wav.import @@ -18,7 +18,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop_mode=0 +edit/loop_mode=2 edit/loop_begin=0 edit/loop_end=-1 compress/mode=0 diff --git a/Scripts/SaveSystem/GameDataSaver.gd b/Scripts/SaveSystem/GameDataSaver.gd index 4013988..30b90bb 100644 --- a/Scripts/SaveSystem/GameDataSaver.gd +++ b/Scripts/SaveSystem/GameDataSaver.gd @@ -13,6 +13,10 @@ func load_data(): "display_mode": 0, "vsync_on": false, "current_resolution_index": 0, + "move_up": KEY_W, + "move_down": KEY_S, + "move_left": KEY_A, + "move_right": KEY_D, "master_volume": 0, "music_volume": 0, "sfx_volume": 0, diff --git a/Scripts/SaveSystem/GlobalSettings.gd b/Scripts/SaveSystem/GlobalSettings.gd index 667d236..0890f19 100644 --- a/Scripts/SaveSystem/GlobalSettings.gd +++ b/Scripts/SaveSystem/GlobalSettings.gd @@ -4,6 +4,8 @@ extends Node @export var music_bus_index : int = 1 @export var sfx_bus_index : int = 2 +@export var remappable_input_actions = ["move_up", "move_down", "move_left", "move_right"] + const resolutions_dictionary : Dictionary = { "800x600" : Vector2(800, 600), "1024x546" : Vector2(1024, 546), @@ -59,3 +61,14 @@ func update_sfx_volume(vol : int) -> void: Save.save_data() AudioServer.set_bus_volume_db(sfx_bus_index, vol) pass + +# Controls +func set_controls_from_save_file() -> void: + for remappable_input_action in remappable_input_actions: + for i in Save.game_data.keys().size(): + if Save.game_data.keys()[i] == remappable_input_action: + for key in InputMap.action_get_events(remappable_input_action): + InputMap.action_erase_event(remappable_input_action, key) + var control_key = InputEventKey.new() + control_key.set_keycode(Save.game_data.values()[i]) + InputMap.action_add_event(remappable_input_action, control_key) diff --git a/Scripts/UI/MainMenuManager.gd b/Scripts/UI/MainMenuManager.gd index 06e599a..54b9f5a 100644 --- a/Scripts/UI/MainMenuManager.gd +++ b/Scripts/UI/MainMenuManager.gd @@ -6,6 +6,7 @@ extends Node # Engine Callbackss func _ready(): + GlobalSettings.set_controls_from_save_file() GlobalSettings.set_display_mode(Save.game_data.display_mode) GlobalSettings.toggle_vsync(Save.game_data.vsync_on) GlobalSettings.set_resolution(Save.game_data.current_resolution_index) diff --git a/Scripts/UI/Remaping/RemapController.gd b/Scripts/UI/Remaping/RemapController.gd index a75eb2d..f054198 100644 --- a/Scripts/UI/Remaping/RemapController.gd +++ b/Scripts/UI/Remaping/RemapController.gd @@ -26,8 +26,10 @@ func remap_key(event): print(event) # Do Actual Rebinding for key in InputMap.action_get_events(remap_action): - InputMap.action_erase_event(remap_action, key) + InputMap.action_erase_event(remap_action, key) InputMap.action_add_event(remap_action, event) + print(event.as_text_keycode()) + #Save.game_data["%s" % [remap_action]] = event.get_text_keycode() remap_button.display_key() remap_button = null set_process_unhandled_key_input(false) diff --git a/project.godot b/project.godot index 79d1506..cd9af76 100644 --- a/project.godot +++ b/project.godot @@ -45,56 +45,48 @@ ui_left={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194319,"physical_keycode":0,"key_label":0,"unicode":4194319,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"echo":false,"script":null) ] } ui_right={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194321,"physical_keycode":0,"key_label":0,"unicode":4194321,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"echo":false,"script":null) ] } ui_up={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194320,"physical_keycode":0,"key_label":0,"unicode":4194320,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"echo":false,"script":null) ] } ui_down={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194322,"physical_keycode":0,"key_label":0,"unicode":4194322,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"echo":false,"script":null) ] } move_left={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":-1.0,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"echo":false,"script":null) ] } move_right={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":1.0,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"echo":false,"script":null) ] } move_up={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":-1.0,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"echo":false,"script":null) ] } move_down={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":1.0,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"echo":false,"script":null) ] } attack={ @@ -116,6 +108,6 @@ attack={ [rendering] -textures/canvas_textures/default_texture_filter=0 renderer/rendering_method="gl_compatibility" renderer/rendering_method.mobile="gl_compatibility" +textures/canvas_textures/default_texture_filter=0 From 4f6ef9b4c2c44ecfa6f211f217164e1d0a8b2116 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Mon, 10 Apr 2023 18:30:20 +0200 Subject: [PATCH 02/26] Create New UI Theme --- Assets/UI/Button/arrow_down.png | Bin 0 -> 212 bytes Assets/UI/Button/arrow_down.png.import | 34 +++ Assets/UI/Button/checked.png | Bin 0 -> 273 bytes Assets/UI/Button/checked.png.import | 34 +++ Assets/UI/Button/disabled.tres | 11 + Assets/UI/Button/focus.tres | 8 + Assets/UI/Button/hover.tres | 10 + Assets/UI/Button/normal.tres | 10 + Assets/UI/Button/pressed.tres | 11 + Assets/UI/Button/unchecked.png | Bin 0 -> 272 bytes Assets/UI/Button/unchecked.png.import | 34 +++ Assets/UI/Check Box/checked.png | Bin 0 -> 223 bytes Assets/UI/Check Box/checked.png.import | 34 +++ Assets/UI/Check Box/unchecked.png | Bin 0 -> 184 bytes Assets/UI/Check Box/unchecked.png.import | 34 +++ Assets/UI/Edit/normal.tres | 13 ++ Assets/UI/Edit/readonly.tres | 13 ++ Assets/UI/Progress/background.tres | 9 + Assets/UI/Progress/fill.tres | 9 + Assets/UI/Scrollbar/h/background.tres | 9 + Assets/UI/Scrollbar/h/background_focus.tres | 9 + Assets/UI/Scrollbar/h/grabber.tres | 9 + Assets/UI/Scrollbar/h/grabber_highlight.tres | 9 + Assets/UI/Scrollbar/h/grabber_pressed.tres | 9 + Assets/UI/Scrollbar/v/background.tres | 9 + Assets/UI/Scrollbar/v/background_focus.tres | 9 + Assets/UI/Scrollbar/v/grabber.tres | 9 + Assets/UI/Scrollbar/v/grabber_highlight.tres | 9 + Assets/UI/Scrollbar/v/grabber_pressed.tres | 9 + Assets/UI/Slider/h/background.tres | 7 + Assets/UI/Slider/h/fill.tres | 7 + Assets/UI/Slider/handle.png | Bin 0 -> 158 bytes Assets/UI/Slider/handle.png.import | 34 +++ Assets/UI/Slider/handle_disabled.png | Bin 0 -> 154 bytes Assets/UI/Slider/handle_disabled.png.import | 34 +++ Assets/UI/Slider/handle_highlight.png | Bin 0 -> 165 bytes Assets/UI/Slider/handle_highlight.png.import | 34 +++ Assets/UI/Slider/v/background.tres | 7 + Assets/UI/Slider/v/fill.tres | 8 + Assets/UI/Tab/left.png | Bin 0 -> 215 bytes Assets/UI/Tab/left.png.import | 34 +++ Assets/UI/Tab/left_highlight.png | Bin 0 -> 204 bytes Assets/UI/Tab/left_highlight.png.import | 34 +++ Assets/UI/Tab/panel.tres | 13 ++ Assets/UI/Tab/right.png | Bin 0 -> 215 bytes Assets/UI/Tab/right.png.import | 34 +++ Assets/UI/Tab/right_highligh.png | Bin 0 -> 204 bytes Assets/UI/Tab/right_highligh.png.import | 34 +++ Assets/UI/Tab/tab_disabled.tres | 13 ++ Assets/UI/Tab/tap_selected.tres | 14 ++ Assets/UI/Tab/tap_unselected.tres | 13 ++ Assets/UI/UI_Theme.tres | 207 +++++++++++++++++++ Scenes/Main Menu.tscn | 18 +- project.godot | 2 +- 54 files changed, 891 insertions(+), 10 deletions(-) create mode 100644 Assets/UI/Button/arrow_down.png create mode 100644 Assets/UI/Button/arrow_down.png.import create mode 100644 Assets/UI/Button/checked.png create mode 100644 Assets/UI/Button/checked.png.import create mode 100644 Assets/UI/Button/disabled.tres create mode 100644 Assets/UI/Button/focus.tres create mode 100644 Assets/UI/Button/hover.tres create mode 100644 Assets/UI/Button/normal.tres create mode 100644 Assets/UI/Button/pressed.tres create mode 100644 Assets/UI/Button/unchecked.png create mode 100644 Assets/UI/Button/unchecked.png.import create mode 100644 Assets/UI/Check Box/checked.png create mode 100644 Assets/UI/Check Box/checked.png.import create mode 100644 Assets/UI/Check Box/unchecked.png create mode 100644 Assets/UI/Check Box/unchecked.png.import create mode 100644 Assets/UI/Edit/normal.tres create mode 100644 Assets/UI/Edit/readonly.tres create mode 100644 Assets/UI/Progress/background.tres create mode 100644 Assets/UI/Progress/fill.tres create mode 100644 Assets/UI/Scrollbar/h/background.tres create mode 100644 Assets/UI/Scrollbar/h/background_focus.tres create mode 100644 Assets/UI/Scrollbar/h/grabber.tres create mode 100644 Assets/UI/Scrollbar/h/grabber_highlight.tres create mode 100644 Assets/UI/Scrollbar/h/grabber_pressed.tres create mode 100644 Assets/UI/Scrollbar/v/background.tres create mode 100644 Assets/UI/Scrollbar/v/background_focus.tres create mode 100644 Assets/UI/Scrollbar/v/grabber.tres create mode 100644 Assets/UI/Scrollbar/v/grabber_highlight.tres create mode 100644 Assets/UI/Scrollbar/v/grabber_pressed.tres create mode 100644 Assets/UI/Slider/h/background.tres create mode 100644 Assets/UI/Slider/h/fill.tres create mode 100644 Assets/UI/Slider/handle.png create mode 100644 Assets/UI/Slider/handle.png.import create mode 100644 Assets/UI/Slider/handle_disabled.png create mode 100644 Assets/UI/Slider/handle_disabled.png.import create mode 100644 Assets/UI/Slider/handle_highlight.png create mode 100644 Assets/UI/Slider/handle_highlight.png.import create mode 100644 Assets/UI/Slider/v/background.tres create mode 100644 Assets/UI/Slider/v/fill.tres create mode 100644 Assets/UI/Tab/left.png create mode 100644 Assets/UI/Tab/left.png.import create mode 100644 Assets/UI/Tab/left_highlight.png create mode 100644 Assets/UI/Tab/left_highlight.png.import create mode 100644 Assets/UI/Tab/panel.tres create mode 100644 Assets/UI/Tab/right.png create mode 100644 Assets/UI/Tab/right.png.import create mode 100644 Assets/UI/Tab/right_highligh.png create mode 100644 Assets/UI/Tab/right_highligh.png.import create mode 100644 Assets/UI/Tab/tab_disabled.tres create mode 100644 Assets/UI/Tab/tap_selected.tres create mode 100644 Assets/UI/Tab/tap_unselected.tres create mode 100644 Assets/UI/UI_Theme.tres diff --git a/Assets/UI/Button/arrow_down.png b/Assets/UI/Button/arrow_down.png new file mode 100644 index 0000000000000000000000000000000000000000..1e0cf43033d05e4fb4940356fe1a38b6142fd56e GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^T0pGA!3HG%pIo60q-J}%IEF;DzMXE!*Py`TdeOkp zuSXF#SmG&a3?o6<)tz zv`W5d!L5p<+!r~oV_vVhax(HviHPIYkL%{oUhAxs&S|0EUc5VL*~qt_-(^jGA8jn_8jyQq=C=cpSL@ex&FoXsV5oo0^ezopr0B*5Y*#H0l literal 0 HcmV?d00001 diff --git a/Assets/UI/Button/arrow_down.png.import b/Assets/UI/Button/arrow_down.png.import new file mode 100644 index 0000000..2cbfa93 --- /dev/null +++ b/Assets/UI/Button/arrow_down.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bj8jxblqmsubn" +path="res://.godot/imported/arrow_down.png-99038aa4c51a77212f9224ab71131733.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/UI/Button/arrow_down.png" +dest_files=["res://.godot/imported/arrow_down.png-99038aa4c51a77212f9224ab71131733.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/UI/Button/checked.png b/Assets/UI/Button/checked.png new file mode 100644 index 0000000000000000000000000000000000000000..a64bfe8b1209f3d0d0f7ee0ae5d29a049fe155a3 GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^9zd+a!3HFcb^PN7Qa3zZ978f1-`?8GdB{P=q44~* zONv`I6>69l$cS&aF3ZB%(Zr{)MDWs#u;}+Z-#dgpJpQ|@g}deWM|Bm>(AaN9>y~?$ z*hui^-{iKtlUL2te|+*wi{1O~zr6d0ftiuH@q$6~CgU{w=<;%N{Tbq?!(NBaX4UOX zn_|r&0fa5Zg&lrN&RgEMEB3IOeCfGLxqtx>a)ieIyLv|PrB4w%BhU~Gc%S{J-3wbb zCN`!z@#<$hS%)1CI4sCybNyrQ5eXEXq~aO0*jnJ5=S82Drr&{nWbkzLb6Mw<&;$U+ C2Vb}V literal 0 HcmV?d00001 diff --git a/Assets/UI/Button/checked.png.import b/Assets/UI/Button/checked.png.import new file mode 100644 index 0000000..3128eb8 --- /dev/null +++ b/Assets/UI/Button/checked.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://je3kjtfx1kr3" +path="res://.godot/imported/checked.png-8d2a59870cf92d0ef0f9d4a2a816b264.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/UI/Button/checked.png" +dest_files=["res://.godot/imported/checked.png-8d2a59870cf92d0ef0f9d4a2a816b264.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/UI/Button/disabled.tres b/Assets/UI/Button/disabled.tres new file mode 100644 index 0000000..562ea39 --- /dev/null +++ b/Assets/UI/Button/disabled.tres @@ -0,0 +1,11 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://bmeh7kt6t886w"] + +[resource] +content_margin_left = 16.0 +content_margin_top = 8.0 +content_margin_right = 16.0 +content_margin_bottom = 16.0 +bg_color = Color(0.388235, 0.294118, 0.490196, 1) +border_width_bottom = 8 +border_color = Color(0.227451, 0.172549, 0.290196, 1) +corner_detail = 1 diff --git a/Assets/UI/Button/focus.tres b/Assets/UI/Button/focus.tres new file mode 100644 index 0000000..cf3dd0a --- /dev/null +++ b/Assets/UI/Button/focus.tres @@ -0,0 +1,8 @@ +[gd_resource type="StyleBoxLine" format=3 uid="uid://gxy851bdkmb0"] + +[resource] +color = Color(0.168627, 0.662745, 0.705882, 1) +grow_begin = 0.0 +grow_end = -8.0 +thickness = 8 +vertical = true diff --git a/Assets/UI/Button/hover.tres b/Assets/UI/Button/hover.tres new file mode 100644 index 0000000..209338c --- /dev/null +++ b/Assets/UI/Button/hover.tres @@ -0,0 +1,10 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://cjyijxvb4qfwy"] + +[resource] +content_margin_left = 16.0 +content_margin_top = 8.0 +content_margin_right = 16.0 +content_margin_bottom = 24.0 +bg_color = Color(0.768627, 0.364706, 0.623529, 1) +border_width_bottom = 8 +border_color = Color(0.560784, 0.270588, 0.458824, 1) diff --git a/Assets/UI/Button/normal.tres b/Assets/UI/Button/normal.tres new file mode 100644 index 0000000..6071d8d --- /dev/null +++ b/Assets/UI/Button/normal.tres @@ -0,0 +1,10 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://bb7opkg3aneg4"] + +[resource] +content_margin_left = 16.0 +content_margin_top = 8.0 +content_margin_right = 16.0 +content_margin_bottom = 16.0 +bg_color = Color(0.392157, 0.380392, 0.760784, 1) +border_width_bottom = 8 +border_color = Color(0.286275, 0.278431, 0.560784, 1) diff --git a/Assets/UI/Button/pressed.tres b/Assets/UI/Button/pressed.tres new file mode 100644 index 0000000..776af6b --- /dev/null +++ b/Assets/UI/Button/pressed.tres @@ -0,0 +1,11 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://cu2rciarim0cc"] + +[resource] +content_margin_left = 16.0 +content_margin_top = 8.0 +content_margin_right = 16.0 +content_margin_bottom = 16.0 +bg_color = Color(0.560784, 0.270588, 0.458824, 1) +border_width_bottom = 8 +border_color = Color(0.768627, 0.364706, 0.623529, 1) +corner_detail = 1 diff --git a/Assets/UI/Button/unchecked.png b/Assets/UI/Button/unchecked.png new file mode 100644 index 0000000000000000000000000000000000000000..b18edb171c076f9885b9f81e515bde23d95869cb GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^9zd+a!3HFcb^PN7QrA6Q978f1-`;ZMYI2Zpc(|waBJTKG6B{)yZ>yzZJ~Y zzxFx&Tg$}k+vz{C#iEGWgtyE?O zu2V<=LIJ(&#akBtpA&3VeBwrW(0|L5qCh=BU6-#mpOZ2AHuDJ=6B`z|kN;Ecg?y08 zKYHKJN`@SAIN+dQ+N|_Xeu)kFVdQ&MBb@0E+%* AZ2$lO literal 0 HcmV?d00001 diff --git a/Assets/UI/Button/unchecked.png.import b/Assets/UI/Button/unchecked.png.import new file mode 100644 index 0000000..34785a9 --- /dev/null +++ b/Assets/UI/Button/unchecked.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dklqdwoqhjm5i" +path="res://.godot/imported/unchecked.png-f39da49c81a690db14659f3749c25cae.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/UI/Button/unchecked.png" +dest_files=["res://.godot/imported/unchecked.png-f39da49c81a690db14659f3749c25cae.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/UI/Check Box/checked.png b/Assets/UI/Check Box/checked.png new file mode 100644 index 0000000000000000000000000000000000000000..733d705a500f6de2b06b90752b5006bc8d454c83 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBmU+53hD5Z!ow1R(K|#djpuq$~ zzto2;)BF-1h8(kCQx#pi?UU~wiN-&V;@Ay;PJb-g#CuWtpr$!j^84;(p9(mb73VOX zdvkkYX~OmGMcOmhuTx}mx*Zh#$nIzqxUlfjIS-Kfj^p-QmmJ!w;~4AA)3TvPp2OEZ?Ln2z=-q^_7pdi8!Xvmk+ z^V>h6CpjYMVwU#(M^Yvt->owLv1(qJa@vw5JmyD4m0gcLzdPH+%m(Al`RJV(G`WBvi>ge#1T`6NmYtYCJN zHF(t!$iBfKVcYG@yLJ+}!hCw{39rQitbKdF@v?7cX4o#lC919U>o3qk22WQ%mvv4F FO#mU+G2{RM literal 0 HcmV?d00001 diff --git a/Assets/UI/Slider/handle.png.import b/Assets/UI/Slider/handle.png.import new file mode 100644 index 0000000..282f65a --- /dev/null +++ b/Assets/UI/Slider/handle.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cl8b7x3q77gm0" +path="res://.godot/imported/handle.png-8afde5e04d6300ddc9d57fb1dfcc8d79.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/UI/Slider/handle.png" +dest_files=["res://.godot/imported/handle.png-8afde5e04d6300ddc9d57fb1dfcc8d79.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/UI/Slider/handle_disabled.png b/Assets/UI/Slider/handle_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..d264e7fd794a99a0550559b17aa8e569a67d204a GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJL{AsTkciggJLMVd%yt2jO<&r_ zv9dUv-eTic^T}t5gdeZLD+aeOCJvc%gqdDsCLM52xWd>IW))}BTkMno<}K!vC_S)( y*-h5qRYM?q&o)kX*@lU17Y=6JFSudNz!1V9b^6NMJ3c_m7(8A5T-G@yGywo(eKI}( literal 0 HcmV?d00001 diff --git a/Assets/UI/Slider/handle_disabled.png.import b/Assets/UI/Slider/handle_disabled.png.import new file mode 100644 index 0000000..6fea3b3 --- /dev/null +++ b/Assets/UI/Slider/handle_disabled.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b388qxyyqx8q2" +path="res://.godot/imported/handle_disabled.png-f9bb4155187553f3c5fd46b71d987798.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/UI/Slider/handle_disabled.png" +dest_files=["res://.godot/imported/handle_disabled.png-f9bb4155187553f3c5fd46b71d987798.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/UI/Slider/handle_highlight.png b/Assets/UI/Slider/handle_highlight.png new file mode 100644 index 0000000000000000000000000000000000000000..35b1ce46948ccd77c281ee448fef0d5057e90657 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ98VX=kciggD{(tp8Rci}eEPM1 z4;M#6iF}}2%_pBJ5`Me}uNcHi7`-0PnNay6GwFbH!WG6I_oU~+rsq6andO)k^GTE* zSi$TjYw)TekiEyMfpu@M+gme5D~ViTJ}dTwFWf8Us=57cYre|k1|%Oc%$NbB=6Sj}hD5Z!ow1R(!GMQ_^OS|o zA%QDrT#icU9N^$_^mOIk8@wkj;zjpMY5X&7M%?EcK7Lj=bI-u_a5@LEK53(mkV?$ NgQu&X%Q~loCID(NR|x|k1|%Oc%$NbBCVRR#hD5Z!o#D;bpdjGPe%RD@ z_VkZ&yN>w;op#^-B3j7EWOACulw$j)CraPN(>}Y2#rLr)W^FoF#nSl7RBrO?39O1n z{EG96Q&&BIVwK|9A@yWVghTPZn06hGiDwnB884RG+^+G2W$#Jn6UzHe+qwD$@XpDP z@ZV?=9DIWF)yXTH@8|Ls$!=0`@t6Db|HAqcoVys0Yw(MUnf5*eI*-BA)z4*}Q$iB} D$Zt%+ literal 0 HcmV?d00001 diff --git a/Assets/UI/Tab/left_highlight.png.import b/Assets/UI/Tab/left_highlight.png.import new file mode 100644 index 0000000..84e2f86 --- /dev/null +++ b/Assets/UI/Tab/left_highlight.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ce87u4fp6tnik" +path="res://.godot/imported/left_highlight.png-1ac6c29bf41e4a73a126b8bc0e6e9ba3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/UI/Tab/left_highlight.png" +dest_files=["res://.godot/imported/left_highlight.png-1ac6c29bf41e4a73a126b8bc0e6e9ba3.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/UI/Tab/panel.tres b/Assets/UI/Tab/panel.tres new file mode 100644 index 0000000..215fa71 --- /dev/null +++ b/Assets/UI/Tab/panel.tres @@ -0,0 +1,13 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://dnwseiejbfrqq"] + +[resource] +content_margin_left = 0.0 +content_margin_top = 0.0 +content_margin_right = 0.0 +content_margin_bottom = 0.0 +bg_color = Color(0.741176, 0.67451, 0.54902, 1) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_width_bottom = 4 +border_color = Color(0.227451, 0.172549, 0.290196, 1) diff --git a/Assets/UI/Tab/right.png b/Assets/UI/Tab/right.png new file mode 100644 index 0000000000000000000000000000000000000000..a64c3d7a6f4da4a4120847ba07756b146e1ee6f0 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB=6Sj}hD5Z!owkv;!9akSGf74) zks~W@Q4)_>0!!P1C5u}B1xH+SKhe6rXVHmGe)IK@?$KK>+vU2MG7uY1E#%TdA%gYnXg6Td$H+U>lg2x{7#xaap*XuSXO^hXzrx! z6O97%oH^K?cy9h>eK>cQX;I^>_g5m>pF*^M(@(nJeFCI`U(V6Ixp3#AV?dWOc)I$z JtaD0e0s#DER_Xu% literal 0 HcmV?d00001 diff --git a/Assets/UI/Tab/right.png.import b/Assets/UI/Tab/right.png.import new file mode 100644 index 0000000..5b9a024 --- /dev/null +++ b/Assets/UI/Tab/right.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bqpbxb5whco41" +path="res://.godot/imported/right.png-cd07be5fd62d07336c292b82afa924d5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/UI/Tab/right.png" +dest_files=["res://.godot/imported/right.png-cd07be5fd62d07336c292b82afa924d5.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/UI/Tab/right_highligh.png b/Assets/UI/Tab/right_highligh.png new file mode 100644 index 0000000000000000000000000000000000000000..e1af80e90c44f77759d3f983fe08f78e870cfc49 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBCVRR#hD5Z!o#DuJKtX_c>yNYh z*3N&q|JG)uWrb6pP1vcqsYPH~!oKs`6K$USK4W8d;^FO$3NA12Y?O3dP#JpciOePi z7k%fzTYH^TgU%^(J5AYA_kPO)pU`y6b{&q3x1B@kXC}1?Z?ALpyTGj>FCf~zC-xW6c?_PeelF{r5}E); ClT&>F literal 0 HcmV?d00001 diff --git a/Assets/UI/Tab/right_highligh.png.import b/Assets/UI/Tab/right_highligh.png.import new file mode 100644 index 0000000..372268f --- /dev/null +++ b/Assets/UI/Tab/right_highligh.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ds6cfed3dmyr3" +path="res://.godot/imported/right_highligh.png-4063a9794ba681bb111200e7e9ad6221.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/UI/Tab/right_highligh.png" +dest_files=["res://.godot/imported/right_highligh.png-4063a9794ba681bb111200e7e9ad6221.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/UI/Tab/tab_disabled.tres b/Assets/UI/Tab/tab_disabled.tres new file mode 100644 index 0000000..0c932a6 --- /dev/null +++ b/Assets/UI/Tab/tab_disabled.tres @@ -0,0 +1,13 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://bgecjuqm2jv0w"] + +[resource] +content_margin_left = 4.0 +content_margin_top = 4.0 +content_margin_right = 4.0 +content_margin_bottom = 0.0 +bg_color = Color(0.741176, 0.67451, 0.54902, 1) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_color = Color(0.227451, 0.172549, 0.290196, 1) +expand_margin_left = 4.0 diff --git a/Assets/UI/Tab/tap_selected.tres b/Assets/UI/Tab/tap_selected.tres new file mode 100644 index 0000000..c014c5e --- /dev/null +++ b/Assets/UI/Tab/tap_selected.tres @@ -0,0 +1,14 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://byrx7smwgsuf0"] + +[resource] +content_margin_left = 4.0 +content_margin_top = 8.0 +content_margin_right = 8.0 +content_margin_bottom = 8.0 +bg_color = Color(0.741176, 0.67451, 0.54902, 1) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_color = Color(0.227451, 0.172549, 0.290196, 1) +expand_margin_left = 4.0 +expand_margin_bottom = 4.0 diff --git a/Assets/UI/Tab/tap_unselected.tres b/Assets/UI/Tab/tap_unselected.tres new file mode 100644 index 0000000..fd94e73 --- /dev/null +++ b/Assets/UI/Tab/tap_unselected.tres @@ -0,0 +1,13 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://ddfin4k7slkmn"] + +[resource] +content_margin_left = 4.0 +content_margin_top = 8.0 +content_margin_right = 8.0 +content_margin_bottom = 8.0 +bg_color = Color(0.741176, 0.67451, 0.54902, 1) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_color = Color(0.227451, 0.172549, 0.290196, 1) +expand_margin_left = 4.0 diff --git a/Assets/UI/UI_Theme.tres b/Assets/UI/UI_Theme.tres new file mode 100644 index 0000000..169cf14 --- /dev/null +++ b/Assets/UI/UI_Theme.tres @@ -0,0 +1,207 @@ +[gd_resource type="Theme" load_steps=47 format=3 uid="uid://bui1mmatapmc8"] + +[ext_resource type="StyleBox" uid="uid://bb7opkg3aneg4" path="res://Assets/UI/Button/normal.tres" id="1_re3m3"] +[ext_resource type="StyleBox" uid="uid://bmeh7kt6t886w" path="res://Assets/UI/Button/disabled.tres" id="1_wt1wr"] +[ext_resource type="StyleBox" uid="uid://cjyijxvb4qfwy" path="res://Assets/UI/Button/hover.tres" id="2_h7pgg"] +[ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="2_j8kea"] +[ext_resource type="StyleBox" uid="uid://gxy851bdkmb0" path="res://Assets/UI/Button/focus.tres" id="2_nf3et"] +[ext_resource type="StyleBox" uid="uid://cu2rciarim0cc" path="res://Assets/UI/Button/pressed.tres" id="4_de308"] +[ext_resource type="StyleBox" uid="uid://cx486vo60qcpp" path="res://Assets/UI/Edit/normal.tres" id="6_lnycp"] +[ext_resource type="Texture2D" uid="uid://c18dqb1wy3its" path="res://Assets/UI/Check Box/checked.png" id="6_srlcu"] +[ext_resource type="Texture2D" uid="uid://cl8b7x3q77gm0" path="res://Assets/UI/Slider/handle.png" id="6_tsx7l"] +[ext_resource type="StyleBox" uid="uid://cgdxtbanwi5gp" path="res://Assets/UI/Scrollbar/h/grabber.tres" id="6_vjj3k"] +[ext_resource type="StyleBox" uid="uid://dvj15u41tqtnm" path="res://Assets/UI/Edit/readonly.tres" id="7_k2jlw"] +[ext_resource type="Texture2D" uid="uid://b388qxyyqx8q2" path="res://Assets/UI/Slider/handle_disabled.png" id="7_m4hfs"] +[ext_resource type="Texture2D" uid="uid://jta11o1n4c3d" path="res://Assets/UI/Check Box/unchecked.png" id="7_p4k8i"] +[ext_resource type="StyleBox" uid="uid://b5e35dfka2svr" path="res://Assets/UI/Scrollbar/h/grabber_highlight.tres" id="7_yv3p6"] +[ext_resource type="Texture2D" uid="uid://o3ufhj36lo0r" path="res://Assets/UI/Slider/handle_highlight.png" id="8_4qpd7"] +[ext_resource type="StyleBox" uid="uid://b6gse1t3c8ibf" path="res://Assets/UI/Scrollbar/h/grabber_pressed.tres" id="8_dr3de"] +[ext_resource type="Texture2D" uid="uid://je3kjtfx1kr3" path="res://Assets/UI/Button/checked.png" id="8_r3sw2"] +[ext_resource type="Texture2D" uid="uid://dklqdwoqhjm5i" path="res://Assets/UI/Button/unchecked.png" id="9_iytk4"] +[ext_resource type="StyleBox" uid="uid://04efvhwskbr6" path="res://Assets/UI/Scrollbar/h/background.tres" id="9_lv5dx"] +[ext_resource type="StyleBox" uid="uid://b1huhquesnexy" path="res://Assets/UI/Scrollbar/h/background_focus.tres" id="10_npblq"] +[ext_resource type="StyleBox" uid="uid://bwlxiw44285g1" path="res://Assets/UI/Slider/h/fill.tres" id="14_b0thp"] +[ext_resource type="StyleBox" uid="uid://b8mdovvxl7lfl" path="res://Assets/UI/Slider/h/background.tres" id="15_4oqlg"] +[ext_resource type="Texture2D" uid="uid://bj8jxblqmsubn" path="res://Assets/UI/Button/arrow_down.png" id="18_jqhuv"] +[ext_resource type="StyleBox" uid="uid://dhna0fajb2uei" path="res://Assets/UI/Progress/background.tres" id="18_ymgal"] +[ext_resource type="StyleBox" uid="uid://b3i7tjv3ok85r" path="res://Assets/UI/Progress/fill.tres" id="19_1x1m2"] +[ext_resource type="Texture2D" uid="uid://de5dv104noe06" path="res://Assets/UI/Tab/left.png" id="20_skg1s"] +[ext_resource type="StyleBox" uid="uid://cm4uy16ypsdyi" path="res://Assets/UI/Scrollbar/v/grabber.tres" id="20_uo4of"] +[ext_resource type="Texture2D" uid="uid://ce87u4fp6tnik" path="res://Assets/UI/Tab/left_highlight.png" id="21_ivr4w"] +[ext_resource type="StyleBox" uid="uid://cmiivkeqn03sa" path="res://Assets/UI/Scrollbar/v/grabber_highlight.tres" id="21_pjklk"] +[ext_resource type="StyleBox" uid="uid://j31rmst7m2q7" path="res://Assets/UI/Scrollbar/v/grabber_pressed.tres" id="22_rcema"] +[ext_resource type="Texture2D" uid="uid://bqpbxb5whco41" path="res://Assets/UI/Tab/right.png" id="22_tbsa0"] +[ext_resource type="StyleBox" uid="uid://de0w7yppc7e0l" path="res://Assets/UI/Scrollbar/v/background.tres" id="23_1wjoi"] +[ext_resource type="Texture2D" uid="uid://ds6cfed3dmyr3" path="res://Assets/UI/Tab/right_highligh.png" id="23_meyle"] +[ext_resource type="StyleBox" uid="uid://15jbtuchd7r6" path="res://Assets/UI/Scrollbar/v/background_focus.tres" id="24_64ah6"] +[ext_resource type="StyleBox" uid="uid://dnwseiejbfrqq" path="res://Assets/UI/Tab/panel.tres" id="24_ypm5h"] +[ext_resource type="StyleBox" uid="uid://bgecjuqm2jv0w" path="res://Assets/UI/Tab/tab_disabled.tres" id="25_2cr8y"] +[ext_resource type="StyleBox" uid="uid://byrx7smwgsuf0" path="res://Assets/UI/Tab/tap_selected.tres" id="25_ou2yk"] +[ext_resource type="StyleBox" uid="uid://bumc1mixgglv8" path="res://Assets/UI/Slider/v/fill.tres" id="25_pdk86"] +[ext_resource type="StyleBox" uid="uid://0jfr1uwuog0s" path="res://Assets/UI/Slider/v/background.tres" id="26_1odpk"] +[ext_resource type="StyleBox" uid="uid://ddfin4k7slkmn" path="res://Assets/UI/Tab/tap_unselected.tres" id="26_pgono"] + +[sub_resource type="Image" id="Image_im0s2"] +data = { +"data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0), +"format": "RGBA8", +"height": 16, +"mipmaps": false, +"width": 4 +} + +[sub_resource type="ImageTexture" id="ImageTexture_g5bup"] +image = SubResource("Image_im0s2") + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_sj7h5"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_jl30t"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_v2px0"] +content_margin_left = 0.0 +content_margin_top = 0.0 +content_margin_right = 0.0 +content_margin_bottom = 0.0 +bg_color = Color(0.741176, 0.67451, 0.54902, 1) +corner_detail = 1 + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_rhkly"] + +[resource] +default_font = ExtResource("2_j8kea") +Button/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) +Button/colors/font_disabled_color = Color(0.227451, 0.172549, 0.290196, 1) +Button/colors/font_focus_color = Color(0.941176, 0.964706, 0.909804, 1) +Button/colors/font_hover_color = Color(0.941176, 0.964706, 0.909804, 1) +Button/colors/font_hover_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) +Button/colors/font_outline_color = Color(0.745098, 0.760784, 0.721569, 1) +Button/colors/font_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) +Button/colors/icon_disabled_color = Color(1, 1, 1, 0.4) +Button/colors/icon_focus_color = Color(0.941176, 0.964706, 0.909804, 1) +Button/colors/icon_hover_color = Color(0.941176, 0.964706, 0.909804, 1) +Button/colors/icon_hover_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) +Button/colors/icon_normal_color = Color(0.941176, 0.964706, 0.909804, 1) +Button/colors/icon_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) +Button/constants/h_separation = 8 +Button/constants/outline_size = 0 +Button/font_sizes/font_size = 32 +Button/styles/disabled = ExtResource("1_wt1wr") +Button/styles/focus = ExtResource("2_nf3et") +Button/styles/hover = ExtResource("2_h7pgg") +Button/styles/normal = ExtResource("1_re3m3") +Button/styles/pressed = ExtResource("4_de308") +CheckBox/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) +CheckBox/colors/font_disabled_color = Color(0.875, 0.875, 0.875, 0.5) +CheckBox/colors/font_focus_color = Color(0.941176, 0.964706, 0.909804, 1) +CheckBox/colors/font_hover_color = Color(0.941176, 0.964706, 0.909804, 1) +CheckBox/colors/font_hover_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) +CheckBox/colors/font_outline_color = Color(0.941176, 0.964706, 0.909804, 1) +CheckBox/colors/font_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) +CheckBox/constants/check_v_offset = 0 +CheckBox/constants/h_separation = 4 +CheckBox/constants/outline_size = 0 +CheckBox/icons/checked = ExtResource("6_srlcu") +CheckBox/icons/unchecked = ExtResource("7_p4k8i") +CheckBox/styles/disabled = ExtResource("1_wt1wr") +CheckBox/styles/focus = ExtResource("2_nf3et") +CheckBox/styles/hover = ExtResource("2_h7pgg") +CheckBox/styles/hover_pressed = ExtResource("4_de308") +CheckBox/styles/normal = ExtResource("1_re3m3") +CheckBox/styles/pressed = ExtResource("4_de308") +CheckButton/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) +CheckButton/colors/font_focus_color = Color(0.941176, 0.964706, 0.909804, 1) +CheckButton/colors/font_hover_color = Color(0.941176, 0.964706, 0.909804, 1) +CheckButton/colors/font_hover_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) +CheckButton/colors/font_outline_color = Color(0.941176, 0.964706, 0.909804, 1) +CheckButton/colors/font_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) +CheckButton/icons/checked = ExtResource("8_r3sw2") +CheckButton/icons/unchecked = ExtResource("9_iytk4") +CheckButton/styles/disabled = ExtResource("1_wt1wr") +CheckButton/styles/focus = ExtResource("2_nf3et") +CheckButton/styles/hover = ExtResource("2_h7pgg") +CheckButton/styles/hover_pressed = ExtResource("4_de308") +CheckButton/styles/normal = ExtResource("1_re3m3") +CheckButton/styles/pressed = ExtResource("4_de308") +HScrollBar/styles/grabber = ExtResource("6_vjj3k") +HScrollBar/styles/grabber_highlight = ExtResource("7_yv3p6") +HScrollBar/styles/grabber_pressed = ExtResource("8_dr3de") +HScrollBar/styles/scroll = ExtResource("9_lv5dx") +HScrollBar/styles/scroll_focus = ExtResource("10_npblq") +HSlider/icons/grabber = ExtResource("6_tsx7l") +HSlider/icons/grabber_disabled = ExtResource("7_m4hfs") +HSlider/icons/grabber_highlight = ExtResource("8_4qpd7") +HSlider/icons/tick = SubResource("ImageTexture_g5bup") +HSlider/styles/grabber_area = ExtResource("14_b0thp") +HSlider/styles/grabber_area_highlight = ExtResource("14_b0thp") +HSlider/styles/slider = ExtResource("15_4oqlg") +Label/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) +Label/colors/font_outline_color = Color(0.745098, 0.760784, 0.721569, 1) +Label/colors/font_shadow_color = Color(0.745098, 0.760784, 0.721569, 1) +Label/constants/line_spacing = 3 +Label/constants/outline_size = 0 +Label/constants/shadow_offset_x = 0 +Label/constants/shadow_offset_y = 4 +Label/constants/shadow_outline_size = 1 +Label/font_sizes/font_size = 32 +Label/styles/normal = SubResource("StyleBoxEmpty_sj7h5") +LineEdit/colors/caret_color = Color(0.168627, 0.662745, 0.705882, 1) +LineEdit/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) +LineEdit/colors/font_selected_color = Color(0.168627, 0.662745, 0.705882, 1) +LineEdit/colors/font_uneditable_color = Color(0.745098, 0.760784, 0.721569, 1) +LineEdit/colors/selection_color = Color(0.745098, 0.760784, 0.721569, 1) +LineEdit/font_sizes/font_size = 24 +LineEdit/styles/focus = SubResource("StyleBoxEmpty_jl30t") +LineEdit/styles/normal = ExtResource("6_lnycp") +LineEdit/styles/read_only = ExtResource("7_k2jlw") +MenuButton/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) +MenuButton/colors/font_focus_color = Color(0.941176, 0.964706, 0.909804, 1) +MenuButton/colors/font_hover_color = Color(0.941176, 0.964706, 0.909804, 1) +MenuButton/colors/font_outline_color = Color(0.941176, 0.964706, 0.909804, 1) +MenuButton/colors/font_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) +MenuButton/styles/disabled = ExtResource("1_wt1wr") +MenuButton/styles/focus = ExtResource("2_nf3et") +MenuButton/styles/hover = ExtResource("2_h7pgg") +MenuButton/styles/normal = ExtResource("1_re3m3") +MenuButton/styles/pressed = ExtResource("4_de308") +OptionButton/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) +OptionButton/colors/font_focus_color = Color(0.941176, 0.964706, 0.909804, 1) +OptionButton/colors/font_hover_color = Color(0.941176, 0.964706, 0.909804, 1) +OptionButton/colors/font_hover_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) +OptionButton/colors/font_outline_color = Color(0.941176, 0.964706, 0.909804, 1) +OptionButton/colors/font_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) +OptionButton/icons/arrow = ExtResource("18_jqhuv") +Panel/styles/panel = SubResource("StyleBoxFlat_v2px0") +ProgressBar/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) +ProgressBar/font_sizes/font_size = 16 +ProgressBar/styles/background = ExtResource("18_ymgal") +ProgressBar/styles/fill = ExtResource("19_1x1m2") +TabContainer/colors/font_selected_color = Color(0.941176, 0.964706, 0.909804, 1) +TabContainer/colors/font_unselected_color = Color(0.941176, 0.964706, 0.909804, 1) +TabContainer/font_sizes/font_size = 16 +TabContainer/icons/decrement = ExtResource("20_skg1s") +TabContainer/icons/decrement_highlight = ExtResource("21_ivr4w") +TabContainer/icons/increment = ExtResource("22_tbsa0") +TabContainer/icons/increment_highlight = ExtResource("23_meyle") +TabContainer/styles/panel = ExtResource("24_ypm5h") +TabContainer/styles/tab_disabled = ExtResource("25_2cr8y") +TabContainer/styles/tab_selected = ExtResource("25_ou2yk") +TabContainer/styles/tab_unselected = ExtResource("26_pgono") +TextEdit/colors/caret_color = Color(0.168627, 0.662745, 0.705882, 1) +TextEdit/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) +TextEdit/colors/font_selected_color = Color(0.168627, 0.662745, 0.705882, 1) +TextEdit/colors/selection_color = Color(0.745098, 0.760784, 0.721569, 1) +TextEdit/font_sizes/font_size = 24 +TextEdit/styles/focus = SubResource("StyleBoxEmpty_rhkly") +TextEdit/styles/normal = ExtResource("6_lnycp") +TextEdit/styles/read_only = ExtResource("7_k2jlw") +VScrollBar/styles/grabber = ExtResource("20_uo4of") +VScrollBar/styles/grabber_highlight = ExtResource("21_pjklk") +VScrollBar/styles/grabber_pressed = ExtResource("22_rcema") +VScrollBar/styles/scroll = ExtResource("23_1wjoi") +VScrollBar/styles/scroll_focus = ExtResource("24_64ah6") +VSlider/icons/grabber = ExtResource("6_tsx7l") +VSlider/icons/grabber_disabled = ExtResource("7_m4hfs") +VSlider/icons/grabber_highlight = ExtResource("8_4qpd7") +VSlider/styles/grabber_area = ExtResource("25_pdk86") +VSlider/styles/grabber_area_highlight = ExtResource("25_pdk86") +VSlider/styles/slider = ExtResource("26_1odpk") diff --git a/Scenes/Main Menu.tscn b/Scenes/Main Menu.tscn index be1520a..c01d14e 100644 --- a/Scenes/Main Menu.tscn +++ b/Scenes/Main Menu.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=14 format=3 uid="uid://4fysk8vaw3e1"] [ext_resource type="Script" path="res://Scripts/UI/MainMenuManager.gd" id="1_qepq0"] -[ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/Easter Egg/Shadow.png" id="2_8o6th"] +[ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png" id="2_8o6th"] [ext_resource type="PackedScene" uid="uid://c4btepmue6d7p" path="res://Scenes/Game.tscn" id="2_28004"] -[ext_resource type="Texture2D" uid="uid://daat37cyg0go5" path="res://Assets/Sprites/Easter Egg/Egg 3.png" id="3_1e3fe"] +[ext_resource type="Texture2D" uid="uid://daat37cyg0go5" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png" id="3_1e3fe"] [ext_resource type="PackedScene" uid="uid://cbfcolm6mjolp" path="res://Prefabs/Settings Menu.tscn" id="3_r3r61"] -[ext_resource type="Texture2D" uid="uid://dhvvw4yckl8x7" path="res://Assets/Sprites/Props/Cake.png" id="5_7ull8"] -[ext_resource type="Texture2D" uid="uid://c3yg6u8yncau3" path="res://Assets/Sprites/Easter Egg/Egg 2.png" id="6_45o7d"] -[ext_resource type="Texture2D" uid="uid://cp84ssaqs3pmp" path="res://Assets/Sprites/UI Elements/Jesus.png" id="6_wnx18"] -[ext_resource type="Texture2D" uid="uid://dkotcqflp3e32" path="res://Assets/Sprites/Easter Egg/Egg 1.png" id="7_285vd"] -[ext_resource type="Theme" uid="uid://o3vg845para" path="res://Assets/UI_Theme.tres" id="8_lr748"] +[ext_resource type="Texture2D" uid="uid://dhvvw4yckl8x7" path="res://Assets/Sprites/Start Menu Old/Cake.png" id="5_7ull8"] +[ext_resource type="Texture2D" uid="uid://c3yg6u8yncau3" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png" id="6_45o7d"] +[ext_resource type="Texture2D" uid="uid://cp84ssaqs3pmp" path="res://Assets/Sprites/Start Menu Old/Jesus.png" id="6_wnx18"] +[ext_resource type="Texture2D" uid="uid://dkotcqflp3e32" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png" id="7_285vd"] [ext_resource type="Script" path="res://Scripts/UI/MenuButton.gd" id="9_2cu5l"] -[ext_resource type="Texture2D" uid="uid://6snf183fgfo5" path="res://Assets/Sprites/UI Elements/Cross.png" id="12_dhfc0"] +[ext_resource type="Theme" uid="uid://o3vg845para" path="res://Assets/UI_Theme.tres" id="10_aqmth"] +[ext_resource type="Texture2D" uid="uid://6snf183fgfo5" path="res://Assets/Sprites/Start Menu Old/Cross.png" id="12_dhfc0"] [ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/Temp Music/omw-to-beat-the-big-bad.wav" id="13_3j724"] [node name="MainMenu" type="Node" node_paths=PackedStringArray("default_focus")] @@ -100,7 +100,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -theme = ExtResource("8_lr748") +theme = ExtResource("10_aqmth") [node name="CenterContainer" type="CenterContainer" parent="MainVBox"] custom_minimum_size = Vector2(0, 150) diff --git a/project.godot b/project.godot index 79d1506..decf7f8 100644 --- a/project.godot +++ b/project.godot @@ -37,7 +37,7 @@ project/assembly_name="HoppyEaster" [gui] -theme/custom="res://Assets/UI_Theme.tres" +theme/custom="res://Assets/UI/UI_Theme.tres" [input] From 53bb97d97233e04fe2ffa7b824e435a6bf6645e6 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Mon, 10 Apr 2023 18:37:15 +0200 Subject: [PATCH 03/26] Improve Button Theme Animation --- Assets/UI/Button/focus.tres | 2 +- Assets/UI/Button/pressed.tres | 2 +- Assets/UI/UI_Theme.tres | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/UI/Button/focus.tres b/Assets/UI/Button/focus.tres index cf3dd0a..749443c 100644 --- a/Assets/UI/Button/focus.tres +++ b/Assets/UI/Button/focus.tres @@ -3,6 +3,6 @@ [resource] color = Color(0.168627, 0.662745, 0.705882, 1) grow_begin = 0.0 -grow_end = -8.0 +grow_end = 0.0 thickness = 8 vertical = true diff --git a/Assets/UI/Button/pressed.tres b/Assets/UI/Button/pressed.tres index 776af6b..b9a1bed 100644 --- a/Assets/UI/Button/pressed.tres +++ b/Assets/UI/Button/pressed.tres @@ -7,5 +7,5 @@ content_margin_right = 16.0 content_margin_bottom = 16.0 bg_color = Color(0.560784, 0.270588, 0.458824, 1) border_width_bottom = 8 -border_color = Color(0.768627, 0.364706, 0.623529, 1) +border_color = Color(0.560784, 0.270588, 0.458824, 1) corner_detail = 1 diff --git a/Assets/UI/UI_Theme.tres b/Assets/UI/UI_Theme.tres index 169cf14..5c2d7c9 100644 --- a/Assets/UI/UI_Theme.tres +++ b/Assets/UI/UI_Theme.tres @@ -41,7 +41,7 @@ [ext_resource type="StyleBox" uid="uid://0jfr1uwuog0s" path="res://Assets/UI/Slider/v/background.tres" id="26_1odpk"] [ext_resource type="StyleBox" uid="uid://ddfin4k7slkmn" path="res://Assets/UI/Tab/tap_unselected.tres" id="26_pgono"] -[sub_resource type="Image" id="Image_im0s2"] +[sub_resource type="Image" id="Image_rlyln"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0), "format": "RGBA8", @@ -51,7 +51,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_g5bup"] -image = SubResource("Image_im0s2") +image = SubResource("Image_rlyln") [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_sj7h5"] From 502820fc5603dbf4aced40194fc1b358086197f3 Mon Sep 17 00:00:00 2001 From: AXVIII3 <76608488+AXVIII3@users.noreply.github.com> Date: Tue, 11 Apr 2023 01:15:25 +0530 Subject: [PATCH 04/26] Added velocity based bunny animations but it does not feel too good --- Prefabs/bunny.tscn | 118 ++++++++++++++++++++++- Scenes/GameBunnyAnims.tscn | 173 ++++++++++++++++++++++++++++++++++ Scenes/Main Menu.tscn | 18 ++-- Scripts/EntitySystem/Bunny.gd | 21 ++++- 4 files changed, 315 insertions(+), 15 deletions(-) create mode 100644 Scenes/GameBunnyAnims.tscn diff --git a/Prefabs/bunny.tscn b/Prefabs/bunny.tscn index cfdce38..7cd45e4 100644 --- a/Prefabs/bunny.tscn +++ b/Prefabs/bunny.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=5 format=3 uid="uid://cpl4tllohhyel"] +[gd_scene load_steps=12 format=3 uid="uid://cpl4tllohhyel"] [ext_resource type="Script" path="res://Scripts/EntitySystem/Bunny.gd" id="1_1kj2b"] [ext_resource type="Texture2D" uid="uid://df2fluk0dlqar" path="res://Assets/Sprites/Bunny/bad_bunny_spritesheet.png" id="2_v8p70"] @@ -8,10 +8,119 @@ [sub_resource type="CircleShape2D" id="CircleShape2D_itvjj"] radius = 14.0 -[node name="Bunny" type="CharacterBody2D" node_paths=PackedStringArray("agent")] +[sub_resource type="Animation" id="Animation_l8j6b"] +resource_name = "MoveLeft" +length = 0.5 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), +"update": 1, +"values": [5, 6, 7, 8, 9] +} + +[sub_resource type="Animation" id="Animation_45lfy"] +resource_name = "MoveUp" +length = 0.5 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), +"update": 1, +"values": [15, 16, 17, 18, 19] +} + +[sub_resource type="Animation" id="Animation_olc18"] +resource_name = "MoveDown" +length = 0.5 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), +"update": 1, +"values": [0, 1, 2, 3, 4] +} + +[sub_resource type="Animation" id="Animation_agj62"] +resource_name = "MoveRight" +length = 0.5 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), +"update": 1, +"values": [10, 11, 12, 13, 14] +} + +[sub_resource type="Animation" id="Animation_6br4g"] +resource_name = "Idle" +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [0] +} + +[sub_resource type="Animation" id="Animation_mp212"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [0] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_uuf00"] +_data = { +"Idle": SubResource("Animation_6br4g"), +"MoveDown": SubResource("Animation_olc18"), +"MoveLeft": SubResource("Animation_l8j6b"), +"MoveRight": SubResource("Animation_agj62"), +"MoveUp": SubResource("Animation_45lfy"), +"RESET": SubResource("Animation_mp212") +} + +[node name="Bunny" type="CharacterBody2D" node_paths=PackedStringArray("animation_player", "agent")] collision_layer = 4 collision_mask = 15 script = ExtResource("1_1kj2b") +animation_player = NodePath("BunnyAnimator") agent = NodePath("NavigationAgent") [node name="Sprite2D" type="Sprite2D" parent="."] @@ -33,5 +142,10 @@ collision_mask = 4 [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] shape = SubResource("CircleShape2D_itvjj") +[node name="BunnyAnimator" type="AnimationPlayer" parent="."] +libraries = { +"": SubResource("AnimationLibrary_uuf00") +} + [connection signal="body_entered" from="Area2D" to="." method="_on_collision"] [connection signal="body_exited" from="Area2D" to="." method="_of_collision"] diff --git a/Scenes/GameBunnyAnims.tscn b/Scenes/GameBunnyAnims.tscn new file mode 100644 index 0000000..efe7362 --- /dev/null +++ b/Scenes/GameBunnyAnims.tscn @@ -0,0 +1,173 @@ +[gd_scene load_steps=17 format=3 uid="uid://dkcl1ycmxpilw"] + +[ext_resource type="Script" path="res://Scripts/GameManager.gd" id="1_1tmfd"] +[ext_resource type="TileSet" uid="uid://bj7uu2180mie3" path="res://Assets/Tileset.tres" id="2_bqk0y"] +[ext_resource type="Script" path="res://Scripts/MapGenerator.gd" id="3_n0wjg"] +[ext_resource type="Script" path="res://Scripts/EntitySystem/BunnyGenerator.gd" id="4_0by8r"] +[ext_resource type="PackedScene" uid="uid://cpl4tllohhyel" path="res://Prefabs/bunny.tscn" id="5_ghq1m"] +[ext_resource type="Script" path="res://Scripts/PlayerController.gd" id="6_o5qq4"] +[ext_resource type="Texture2D" uid="uid://ojlfqxj5bilo" path="res://Assets/Sprites/Jesus/jesus_spritesheet.png" id="7_we2bi"] +[ext_resource type="Script" path="res://Scripts/WeaponSystem/WeaponController.gd" id="8_p0li1"] +[ext_resource type="PackedScene" uid="uid://csxh42o8twxwn" path="res://Prefabs/projectile.tscn" id="9_k5fai"] + +[sub_resource type="Animation" id="Animation_kdxam"] +resource_name = "Idle" +length = 0.1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Player Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [0] +} + +[sub_resource type="Animation" id="Animation_dwpep"] +resource_name = "MoveDown" +length = 0.8 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Player Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = false +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1), +"update": 1, +"values": [0, 1, 2, 3, 4, 5, 6, 7] +} + +[sub_resource type="Animation" id="Animation_2jvl5"] +resource_name = "MoveLeft" +length = 0.8 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Player Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1), +"update": 1, +"values": [24, 25, 26, 27, 28, 29, 30, 31] +} + +[sub_resource type="Animation" id="Animation_4ig1u"] +resource_name = "MoveRight" +length = 0.8 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Player Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1), +"update": 1, +"values": [8, 9, 10, 11, 12, 13, 14, 15] +} + +[sub_resource type="Animation" id="Animation_pswkh"] +resource_name = "MoveUp" +length = 0.8 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Player Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1), +"update": 1, +"values": [16, 17, 18, 19, 20, 21, 22, 23] +} + +[sub_resource type="Animation" id="Animation_o3hln"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Player Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [0] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_bi1h3"] +_data = { +"Idle": SubResource("Animation_kdxam"), +"MoveDown": SubResource("Animation_dwpep"), +"MoveLeft": SubResource("Animation_2jvl5"), +"MoveRight": SubResource("Animation_4ig1u"), +"MoveUp": SubResource("Animation_pswkh"), +"RESET": SubResource("Animation_o3hln") +} + +[node name="GameManager" type="Node2D" node_paths=PackedStringArray("map_generator", "bunny_generator")] +script = ExtResource("1_1tmfd") +map_generator = NodePath("Map Generator") +bunny_generator = NodePath("Bunny Generator") + +[node name="Map Generator" type="TileMap" parent="."] +scale = Vector2(1.5, 1.5) +tile_set = ExtResource("2_bqk0y") +cell_quadrant_size = 32 +format = 2 +layer_0/tile_data = PackedInt32Array(2949194, 720897, 3, 2883658, 720897, 2, 2818122, 720897, 2, 2752586, 720897, 2, 2687050, 720897, 2, 2621514, 720897, 2, 2555978, 720897, 2, 2490442, 720897, 2, 2424906, 720897, 2, 2359370, 720897, 2, 2293834, 720897, 2, 2228298, 720897, 2, 2162762, 720897, 2, 2097226, 720897, 2, 2031690, 720897, 2, 1966154, 720897, 2, 1900618, 720897, 2, 1835082, 720897, 2, 1769546, 720897, 2, 1704010, 720897, 2, 1638474, 720897, 2, 1572938, 720897, 2, 1507402, 720897, 2, 1441866, 720897, 2, 1376330, 720897, 2, 1310794, 720897, 2, 1245258, 720897, 2, 1179722, 720897, 2, 1114186, 720897, 2, 1048650, 720897, 2, 983114, 720897, 2, 917578, 720897, 2, 852042, 720897, 2, 786506, 720897, 2, 720970, 720897, 2, 655434, 720897, 2, 589898, 720897, 2, 524362, 720897, 2, 458826, 720897, 2, 393290, 720897, 2, 327754, 720897, 2, 262218, 720897, 2, 196682, 720897, 2, 131146, 720897, 2, 65610, 720897, 2, 74, 720897, 2, -65462, 720897, 2, -130998, 720897, 2, -196534, 720897, 2, -262070, 720897, 2, -327606, 720897, 2, -393142, 720897, 2, -458678, 720897, 2, -524214, 720897, 2, -589750, 720897, 2, -655286, 720897, 0, 2949193, 589825, 3, 2883657, 589825, 2, 2818121, 589825, 2, 2752585, 589825, 2, 2687049, 589825, 2, 2621513, 589825, 2, 2555977, 589825, 2, 2490441, 589825, 2, 2424905, 589825, 2, 2359369, 589825, 2, 2293833, 589825, 2, 2228297, 589825, 2, 2162761, 589825, 2, 2097225, 589825, 2, 2031689, 589825, 2, 1966153, 589825, 2, 1900617, 589825, 2, 1835081, 589825, 2, 1769545, 589825, 2, 1704009, 589825, 2, 1638473, 589825, 2, 1572937, 589825, 2, 1507401, 589825, 2, 1441865, 589825, 2, 1376329, 589825, 2, 1310793, 589825, 2, 1245257, 589825, 2, 1179721, 589825, 2, 1114185, 589825, 2, 1048649, 589825, 2, 983113, 589825, 2, 917577, 589825, 2, 852041, 589825, 2, 786505, 589825, 2, 720969, 589825, 2, 655433, 589825, 2, 589897, 589825, 2, 524361, 589825, 2, 458825, 589825, 2, 393289, 589825, 2, 327753, 589825, 2, 262217, 589825, 2, 196681, 589825, 2, 131145, 589825, 2, 65609, 589825, 2, 73, 589825, 2, -65463, 589825, 2, -130999, 589825, 2, -196535, 589825, 2, -262071, 589825, 2, -327607, 589825, 2, -393143, 589825, 2, -458679, 589825, 2, -524215, 589825, 2, -589751, 589825, 2, -655287, 655361, 0, 2949192, 589825, 3, 2883656, 589825, 2, 2818120, 589825, 2, 2752584, 589825, 2, 2687048, 589825, 2, 2621512, 589825, 2, 2555976, 589825, 2, 2490440, 589825, 2, 2424904, 589825, 2, 2359368, 589825, 2, 2293832, 589825, 2, 2228296, 589825, 2, 2162760, 589825, 2, 2097224, 589825, 2, 2031688, 589825, 2, 1966152, 589825, 2, 1900616, 589825, 2, 1835080, 589825, 2, 1769544, 589825, 2, 1704008, 589825, 2, 1638472, 589825, 2, 1572936, 589825, 2, 1507400, 589825, 2, 1441864, 589825, 2, 1376328, 589825, 2, 1310792, 589825, 2, 1245256, 589825, 2, 1179720, 589825, 2, 1114184, 589825, 2, 1048648, 589825, 2, 983112, 589825, 2, 917576, 589825, 2, 852040, 589825, 2, 786504, 589825, 2, 720968, 589825, 2, 655432, 589825, 2, 589896, 589825, 2, 524360, 589825, 2, 458824, 589825, 2, 393288, 589825, 2, 327752, 589825, 2, 262216, 589825, 2, 196680, 589825, 2, 131144, 589825, 2, 65608, 589825, 2, 72, 589825, 2, -65464, 589825, 2, -131000, 589825, 2, -196536, 589825, 2, -262072, 589825, 2, -327608, 589825, 2, -393144, 589825, 2, -458680, 589825, 2, -524216, 589825, 2, -589752, 589825, 2, -655288, 655361, 0, 2949191, 589825, 3, 2883655, 589825, 2, 2818119, 589825, 2, 2752583, 589825, 2, 2687047, 589825, 2, 2621511, 589825, 2, 2555975, 589825, 2, 2490439, 589825, 2, 2424903, 589825, 2, 2359367, 589825, 2, 2293831, 589825, 2, 2228295, 589825, 2, 2162759, 589825, 2, 2097223, 589825, 2, 2031687, 589825, 2, 1966151, 589825, 2, 1900615, 589825, 2, 1835079, 589825, 2, 1769543, 589825, 2, 1704007, 589825, 2, 1638471, 589825, 2, 1572935, 589825, 2, 1507399, 589825, 2, 1441863, 589825, 2, 1376327, 589825, 2, 1310791, 589825, 2, 1245255, 589825, 2, 1179719, 589825, 2, 1114183, 589825, 2, 1048647, 589825, 2, 983111, 589825, 2, 917575, 589825, 2, 852039, 589825, 2, 786503, 589825, 2, 720967, 589825, 2, 655431, 589825, 2, 589895, 589825, 2, 524359, 589825, 2, 458823, 589825, 2, 393287, 589825, 2, 327751, 589825, 2, 262215, 589825, 2, 196679, 589825, 2, 131143, 589825, 2, 65607, 589825, 2, 71, 589825, 2, -65465, 589825, 2, -131001, 589825, 2, -196537, 589825, 2, -262073, 589825, 2, -327609, 589825, 2, -393145, 589825, 2, -458681, 589825, 2, -524217, 589825, 2, -589753, 589825, 2, -655289, 655361, 0, 2949190, 589825, 3, 2883654, 589825, 2, 2818118, 589825, 2, 2752582, 589825, 2, 2687046, 589825, 2, 2621510, 589825, 2, 2555974, 589825, 2, 2490438, 589825, 2, 2424902, 589825, 2, 2359366, 589825, 2, 2293830, 589825, 2, 2228294, 589825, 2, 2162758, 589825, 2, 2097222, 589825, 2, 2031686, 589825, 2, 1966150, 589825, 2, 1900614, 589825, 2, 1835078, 589825, 2, 1769542, 589825, 2, 1704006, 589825, 2, 1638470, 589825, 2, 1572934, 589825, 2, 1507398, 589825, 2, 1441862, 589825, 2, 1376326, 589825, 2, 1310790, 589825, 2, 1245254, 589825, 2, 1179718, 589825, 2, 1114182, 589825, 2, 1048646, 589825, 2, 983110, 589825, 2, 917574, 589825, 2, 852038, 589825, 2, 786502, 589825, 2, 720966, 589825, 2, 655430, 589825, 2, 589894, 589825, 2, 524358, 589825, 2, 458822, 589825, 2, 393286, 589825, 2, 327750, 589825, 2, 262214, 589825, 2, 196678, 589825, 2, 131142, 589825, 2, 65606, 589825, 2, 70, 589825, 2, -65466, 589825, 2, -131002, 589825, 2, -196538, 589825, 2, -262074, 589825, 2, -327610, 589825, 2, -393146, 589825, 2, -458682, 589825, 2, -524218, 589825, 2, -589754, 589825, 2, -655290, 655361, 0, 2949189, 589825, 3, 2883653, 589825, 2, 2818117, 589825, 2, 2752581, 589825, 2, 2687045, 589825, 2, 2621509, 589825, 2, 2555973, 589825, 2, 2490437, 589825, 2, 2424901, 589825, 2, 2359365, 589825, 2, 2293829, 589825, 2, 2228293, 589825, 2, 2162757, 589825, 2, 2097221, 589825, 2, 2031685, 589825, 2, 1966149, 589825, 2, 1900613, 589825, 2, 1835077, 589825, 2, 1769541, 589825, 2, 1704005, 589825, 2, 1638469, 589825, 2, 1572933, 589825, 2, 1507397, 589825, 2, 1441861, 589825, 2, 1376325, 589825, 2, 1310789, 589825, 2, 1245253, 589825, 2, 1179717, 589825, 2, 1114181, 589825, 2, 1048645, 589825, 2, 983109, 589825, 2, 917573, 589825, 2, 852037, 589825, 2, 786501, 589825, 2, 720965, 589825, 2, 655429, 589825, 2, 589893, 589825, 2, 524357, 589825, 2, 458821, 589825, 2, 393285, 589825, 2, 327749, 589825, 2, 262213, 589825, 2, 196677, 589825, 2, 131141, 589825, 2, 65605, 589825, 2, 69, 589825, 2, -65467, 589825, 2, -131003, 589825, 2, -196539, 589825, 2, -262075, 589825, 2, -327611, 589825, 2, -393147, 589825, 2, -458683, 589825, 2, -524219, 589825, 2, -589755, 589825, 2, -655291, 655361, 0, 2949188, 589825, 3, 2883652, 589825, 2, 2818116, 589825, 2, 2752580, 589825, 2, 2687044, 589825, 2, 2621508, 589825, 2, 2555972, 589825, 2, 2490436, 589825, 2, 2424900, 589825, 2, 2359364, 589825, 2, 2293828, 589825, 2, 2228292, 589825, 2, 2162756, 589825, 2, 2097220, 589825, 2, 2031684, 589825, 2, 1966148, 589825, 2, 1900612, 589825, 2, 1835076, 589825, 2, 1769540, 589825, 2, 1704004, 589825, 2, 1638468, 589825, 2, 1572932, 589825, 2, 1507396, 589825, 2, 1441860, 589825, 2, 1376324, 589825, 2, 1310788, 589825, 2, 1245252, 589825, 2, 1179716, 589825, 2, 1114180, 589825, 2, 1048644, 589825, 2, 983108, 589825, 2, 917572, 589825, 2, 852036, 589825, 2, 786500, 589825, 2, 720964, 589825, 2, 655428, 589825, 2, 589892, 589825, 2, 524356, 589825, 2, 458820, 589825, 2, 393284, 589825, 2, 327748, 589825, 2, 262212, 589825, 2, 196676, 589825, 2, 131140, 589825, 2, 65604, 589825, 2, 68, 589825, 2, -65468, 589825, 2, -131004, 589825, 2, -196540, 589825, 2, -262076, 589825, 2, -327612, 589825, 2, -393148, 589825, 2, -458684, 589825, 2, -524220, 589825, 2, -589756, 589825, 2, -655292, 655361, 0, 2949187, 589825, 3, 2883651, 589825, 2, 2818115, 589825, 2, 2752579, 589825, 2, 2687043, 589825, 2, 2621507, 589825, 2, 2555971, 589825, 2, 2490435, 589825, 2, 2424899, 589825, 2, 2359363, 589825, 2, 2293827, 589825, 2, 2228291, 589825, 2, 2162755, 589825, 2, 2097219, 589825, 2, 2031683, 589825, 2, 1966147, 589825, 2, 1900611, 589825, 2, 1835075, 589825, 2, 1769539, 589825, 2, 1704003, 589825, 2, 1638467, 589825, 2, 1572931, 589825, 2, 1507395, 589825, 2, 1441859, 589825, 2, 1376323, 589825, 2, 1310787, 589825, 2, 1245251, 589825, 2, 1179715, 589825, 2, 1114179, 589825, 2, 1048643, 589825, 2, 983107, 589825, 2, 917571, 589825, 2, 852035, 589825, 2, 786499, 589825, 2, 720963, 589825, 2, 655427, 589825, 2, 589891, 589825, 2, 524355, 589825, 2, 458819, 589825, 2, 393283, 589825, 2, 327747, 589825, 2, 262211, 589825, 2, 196675, 589825, 2, 131139, 589825, 2, 65603, 589825, 2, 67, 589825, 2, -65469, 589825, 2, -131005, 589825, 2, -196541, 589825, 2, -262077, 589825, 2, -327613, 589825, 2, -393149, 589825, 2, -458685, 589825, 2, -524221, 589825, 2, -589757, 589825, 2, -655293, 655361, 0, 2949186, 589825, 3, 2883650, 589825, 2, 2818114, 589825, 2, 2752578, 589825, 2, 2687042, 589825, 2, 2621506, 589825, 2, 2555970, 589825, 2, 2490434, 589825, 2, 2424898, 589825, 2, 2359362, 589825, 2, 2293826, 589825, 2, 2228290, 589825, 2, 2162754, 589825, 2, 2097218, 589825, 2, 2031682, 589825, 2, 1966146, 589825, 2, 1900610, 589825, 2, 1835074, 589825, 2, 1769538, 589825, 2, 1704002, 589825, 2, 1638466, 589825, 2, 1572930, 589825, 2, 1507394, 589825, 2, 1441858, 589825, 2, 1376322, 589825, 2, 1310786, 589825, 2, 1245250, 589825, 2, 1179714, 589825, 2, 1114178, 589825, 2, 1048642, 589825, 2, 983106, 589825, 2, 917570, 589825, 2, 852034, 589825, 2, 786498, 589825, 2, 720962, 589825, 2, 655426, 589825, 2, 589890, 589825, 2, 524354, 589825, 2, 458818, 589825, 2, 393282, 589825, 2, 327746, 589825, 2, 262210, 589825, 2, 196674, 589825, 2, 131138, 589825, 2, 65602, 589825, 2, 66, 589825, 2, -65470, 589825, 2, -131006, 589825, 2, -196542, 589825, 2, -262078, 589825, 2, -327614, 589825, 2, -393150, 589825, 2, -458686, 589825, 2, -524222, 589825, 2, -589758, 589825, 2, -655294, 655361, 0, 2949185, 589825, 3, 2883649, 589825, 2, 2818113, 589825, 2, 2752577, 589825, 2, 2687041, 589825, 2, 2621505, 589825, 2, 2555969, 589825, 2, 2490433, 589825, 2, 2424897, 589825, 2, 2359361, 589825, 2, 2293825, 589825, 2, 2228289, 589825, 2, 2162753, 589825, 2, 2097217, 589825, 2, 2031681, 589825, 2, 1966145, 589825, 2, 1900609, 589825, 2, 1835073, 589825, 2, 1769537, 589825, 2, 1704001, 589825, 2, 1638465, 589825, 2, 1572929, 589825, 2, 1507393, 589825, 2, 1441857, 589825, 2, 1376321, 589825, 2, 1310785, 589825, 2, 1245249, 589825, 2, 1179713, 589825, 2, 1114177, 589825, 2, 1048641, 589825, 2, 983105, 589825, 2, 917569, 589825, 2, 852033, 589825, 2, 786497, 589825, 2, 720961, 589825, 2, 655425, 589825, 2, 589889, 589825, 2, 524353, 589825, 2, 458817, 589825, 2, 393281, 589825, 2, 327745, 589825, 2, 262209, 589825, 2, 196673, 589825, 2, 131137, 589825, 2, 65601, 589825, 2, 65, 589825, 2, -65471, 589825, 2, -131007, 589825, 2, -196543, 589825, 2, -262079, 589825, 2, -327615, 589825, 2, -393151, 589825, 2, -458687, 589825, 2, -524223, 589825, 2, -589759, 589825, 2, -655295, 655361, 0, 2949184, 589825, 3, 2883648, 589825, 2, 2818112, 589825, 2, 2752576, 589825, 2, 2687040, 589825, 2, 2621504, 589825, 2, 2555968, 589825, 2, 2490432, 589825, 2, 2424896, 589825, 2, 2359360, 589825, 2, 2293824, 589825, 2, 2228288, 589825, 2, 2162752, 589825, 2, 2097216, 589825, 2, 2031680, 589825, 2, 1966144, 589825, 2, 1900608, 589825, 2, 1835072, 589825, 2, 1769536, 589825, 2, 1704000, 589825, 2, 1638464, 589825, 2, 1572928, 589825, 2, 1507392, 589825, 2, 1441856, 589825, 2, 1376320, 589825, 2, 1310784, 589825, 2, 1245248, 589825, 2, 1179712, 589825, 2, 1114176, 589825, 2, 1048640, 589825, 2, 983104, 589825, 2, 917568, 589825, 2, 852032, 589825, 2, 786496, 589825, 2, 720960, 589825, 2, 655424, 589825, 2, 589888, 589825, 2, 524352, 589825, 2, 458816, 589825, 2, 393280, 589825, 2, 327744, 589825, 2, 262208, 589825, 2, 196672, 589825, 2, 131136, 589825, 2, 65600, 589825, 2, 64, 589825, 2, -65472, 589825, 2, -131008, 589825, 2, -196544, 589825, 2, -262080, 589825, 2, -327616, 589825, 2, -393152, 589825, 2, -458688, 589825, 2, -524224, 589825, 2, -589760, 589825, 2, -655296, 655361, 0, 2949183, 589825, 3, 2883647, 589825, 2, 2818111, 589825, 2, 2752575, 589825, 2, 2687039, 589825, 2, 2621503, 589825, 2, 2555967, 589825, 2, 2490431, 589825, 2, 2424895, 589825, 2, 2359359, 589825, 2, 2293823, 589825, 2, 2228287, 589825, 2, 2162751, 589825, 2, 2097215, 589825, 2, 2031679, 589825, 2, 1966143, 589825, 2, 1900607, 589825, 2, 1835071, 589825, 2, 1769535, 589825, 2, 1703999, 589825, 2, 1638463, 589825, 2, 1572927, 589825, 2, 1507391, 589825, 2, 1441855, 589825, 2, 1376319, 589825, 2, 1310783, 589825, 2, 1245247, 589825, 2, 1179711, 589825, 2, 1114175, 589825, 2, 1048639, 589825, 2, 983103, 589825, 2, 917567, 589825, 2, 852031, 589825, 2, 786495, 589825, 2, 720959, 589825, 2, 655423, 589825, 2, 589887, 589825, 2, 524351, 589825, 2, 458815, 589825, 2, 393279, 589825, 2, 327743, 589825, 2, 262207, 589825, 2, 196671, 589825, 2, 131135, 589825, 2, 65599, 589825, 2, 63, 589825, 2, -65473, 589825, 2, -131009, 589825, 2, -196545, 589825, 2, -262081, 589825, 2, -327617, 589825, 2, -393153, 589825, 2, -458689, 589825, 2, -524225, 589825, 2, -589761, 589825, 2, -655297, 655361, 0, 2949182, 589825, 3, 2883646, 589825, 2, 2818110, 589825, 2, 2752574, 589825, 2, 2687038, 589825, 2, 2621502, 589825, 2, 2555966, 589825, 2, 2490430, 589825, 2, 2424894, 589825, 2, 2359358, 589825, 2, 2293822, 589825, 2, 2228286, 589825, 2, 2162750, 589825, 2, 2097214, 589825, 2, 2031678, 589825, 2, 1966142, 589825, 2, 1900606, 589825, 2, 1835070, 589825, 2, 1769534, 589825, 2, 1703998, 589825, 2, 1638462, 589825, 2, 1572926, 589825, 2, 1507390, 589825, 2, 1441854, 589825, 2, 1376318, 589825, 2, 1310782, 589825, 2, 1245246, 589825, 2, 1179710, 589825, 2, 1114174, 589825, 2, 1048638, 589825, 2, 983102, 589825, 2, 917566, 589825, 2, 852030, 589825, 2, 786494, 589825, 2, 720958, 589825, 2, 655422, 589825, 2, 589886, 589825, 2, 524350, 589825, 2, 458814, 589825, 2, 393278, 589825, 2, 327742, 589825, 2, 262206, 589825, 2, 196670, 589825, 2, 131134, 589825, 2, 65598, 589825, 2, 62, 589825, 2, -65474, 589825, 2, -131010, 589825, 2, -196546, 589825, 2, -262082, 589825, 2, -327618, 589825, 2, -393154, 589825, 2, -458690, 589825, 2, -524226, 589825, 2, -589762, 589825, 2, -655298, 655361, 0, 2949181, 589825, 3, 2883645, 589825, 2, 2818109, 589825, 2, 2752573, 589825, 2, 2687037, 589825, 2, 2621501, 589825, 2, 2555965, 589825, 2, 2490429, 589825, 2, 2424893, 589825, 2, 2359357, 589825, 2, 2293821, 589825, 2, 2228285, 589825, 2, 2162749, 589825, 2, 2097213, 589825, 2, 2031677, 589825, 2, 1966141, 589825, 2, 1900605, 589825, 2, 1835069, 589825, 2, 1769533, 589825, 2, 1703997, 589825, 2, 1638461, 589825, 2, 1572925, 589825, 2, 1507389, 589825, 2, 1441853, 589825, 2, 1376317, 589825, 2, 1310781, 589825, 2, 1245245, 589825, 2, 1179709, 589825, 2, 1114173, 589825, 2, 1048637, 589825, 2, 983101, 589825, 2, 917565, 589825, 2, 852029, 589825, 2, 786493, 589825, 2, 720957, 589825, 2, 655421, 589825, 2, 589885, 589825, 2, 524349, 589825, 2, 458813, 589825, 2, 393277, 589825, 2, 327741, 589825, 2, 262205, 589825, 2, 196669, 589825, 2, 131133, 589825, 2, 65597, 589825, 2, 61, 589825, 2, -65475, 589825, 2, -131011, 589825, 2, -196547, 589825, 2, -262083, 589825, 2, -327619, 589825, 2, -393155, 589825, 2, -458691, 589825, 2, -524227, 589825, 2, -589763, 589825, 2, -655299, 655361, 0, 2949180, 589825, 3, 2883644, 589825, 2, 2818108, 589825, 2, 2752572, 589825, 2, 2687036, 589825, 2, 2621500, 589825, 2, 2555964, 589825, 2, 2490428, 589825, 2, 2424892, 589825, 2, 2359356, 589825, 2, 2293820, 589825, 2, 2228284, 589825, 2, 2162748, 589825, 2, 2097212, 589825, 2, 2031676, 589825, 2, 1966140, 589825, 2, 1900604, 589825, 2, 1835068, 589825, 2, 1769532, 589825, 2, 1703996, 589825, 2, 1638460, 589825, 2, 1572924, 589825, 2, 1507388, 589825, 2, 1441852, 589825, 2, 1376316, 589825, 2, 1310780, 589825, 2, 1245244, 589825, 2, 1179708, 589825, 2, 1114172, 589825, 2, 1048636, 589825, 2, 983100, 589825, 2, 917564, 589825, 2, 852028, 589825, 2, 786492, 589825, 2, 720956, 589825, 2, 655420, 589825, 2, 589884, 589825, 2, 524348, 589825, 2, 458812, 589825, 2, 393276, 589825, 2, 327740, 589825, 2, 262204, 589825, 2, 196668, 589825, 2, 131132, 589825, 2, 65596, 589825, 2, 60, 589825, 2, -65476, 589825, 2, -131012, 589825, 2, -196548, 589825, 2, -262084, 589825, 2, -327620, 589825, 2, -393156, 589825, 2, -458692, 589825, 2, -524228, 589825, 2, -589764, 589825, 2, -655300, 655361, 0, 2949179, 589825, 3, 2883643, 589825, 2, 2818107, 589825, 2, 2752571, 589825, 2, 2687035, 589825, 2, 2621499, 589825, 2, 2555963, 589825, 2, 2490427, 589825, 2, 2424891, 589825, 2, 2359355, 589825, 2, 2293819, 589825, 2, 2228283, 589825, 2, 2162747, 589825, 2, 2097211, 589825, 2, 2031675, 589825, 2, 1966139, 589825, 2, 1900603, 589825, 2, 1835067, 589825, 2, 1769531, 589825, 2, 1703995, 589825, 2, 1638459, 589825, 2, 1572923, 589825, 2, 1507387, 589825, 2, 1441851, 589825, 2, 1376315, 589825, 2, 1310779, 589825, 2, 1245243, 589825, 2, 1179707, 589825, 2, 1114171, 589825, 2, 1048635, 589825, 2, 983099, 589825, 2, 917563, 589825, 2, 852027, 589825, 2, 786491, 589825, 2, 720955, 589825, 2, 655419, 589825, 2, 589883, 589825, 2, 524347, 589825, 2, 458811, 589825, 2, 393275, 589825, 2, 327739, 589825, 2, 262203, 589825, 2, 196667, 589825, 2, 131131, 589825, 2, 65595, 589825, 2, 59, 589825, 2, -65477, 589825, 2, -131013, 589825, 2, -196549, 589825, 2, -262085, 589825, 2, -327621, 589825, 2, -393157, 589825, 2, -458693, 589825, 2, -524229, 589825, 2, -589765, 589825, 2, -655301, 655361, 0, 2949178, 589825, 3, 2883642, 589825, 2, 2818106, 589825, 2, 2752570, 589825, 2, 2687034, 589825, 2, 2621498, 589825, 2, 2555962, 589825, 2, 2490426, 589825, 2, 2424890, 589825, 2, 2359354, 589825, 2, 2293818, 589825, 2, 2228282, 589825, 2, 2162746, 589825, 2, 2097210, 589825, 2, 2031674, 589825, 2, 1966138, 589825, 2, 1900602, 589825, 2, 1835066, 589825, 2, 1769530, 589825, 2, 1703994, 589825, 2, 1638458, 589825, 2, 1572922, 589825, 2, 1507386, 589825, 2, 1441850, 589825, 2, 1376314, 589825, 2, 1310778, 589825, 2, 1245242, 589825, 2, 1179706, 589825, 2, 1114170, 589825, 2, 1048634, 589825, 2, 983098, 589825, 2, 917562, 589825, 2, 852026, 589825, 2, 786490, 589825, 2, 720954, 589825, 2, 655418, 589825, 2, 589882, 589825, 2, 524346, 589825, 2, 458810, 589825, 2, 393274, 589825, 2, 327738, 589825, 2, 262202, 589825, 2, 196666, 589825, 2, 131130, 589825, 2, 65594, 589825, 2, 58, 589825, 2, -65478, 589825, 2, -131014, 589825, 2, -196550, 589825, 2, -262086, 589825, 2, -327622, 589825, 2, -393158, 589825, 2, -458694, 589825, 2, -524230, 589825, 2, -589766, 589825, 2, -655302, 655361, 0, 2949177, 589825, 3, 2883641, 589825, 2, 2818105, 589825, 2, 2752569, 589825, 2, 2687033, 589825, 2, 2621497, 589825, 2, 2555961, 589825, 2, 2490425, 589825, 2, 2424889, 589825, 2, 2359353, 589825, 2, 2293817, 589825, 2, 2228281, 589825, 2, 2162745, 589825, 2, 2097209, 589825, 2, 2031673, 589825, 2, 1966137, 589825, 2, 1900601, 589825, 2, 1835065, 589825, 2, 1769529, 589825, 2, 1703993, 589825, 2, 1638457, 589825, 2, 1572921, 589825, 2, 1507385, 589825, 2, 1441849, 589825, 2, 1376313, 589825, 2, 1310777, 589825, 2, 1245241, 589825, 2, 1179705, 589825, 2, 1114169, 589825, 2, 1048633, 589825, 2, 983097, 589825, 2, 917561, 589825, 2, 852025, 589825, 2, 786489, 589825, 2, 720953, 589825, 2, 655417, 589825, 2, 589881, 589825, 2, 524345, 589825, 2, 458809, 589825, 2, 393273, 589825, 2, 327737, 589825, 2, 262201, 589825, 2, 196665, 589825, 2, 131129, 589825, 2, 65593, 589825, 2, 57, 589825, 2, -65479, 589825, 2, -131015, 589825, 2, -196551, 589825, 2, -262087, 589825, 2, -327623, 589825, 2, -393159, 589825, 2, -458695, 589825, 2, -524231, 589825, 2, -589767, 589825, 2, -655303, 655361, 0, 2949176, 589825, 3, 2883640, 589825, 2, 2818104, 589825, 2, 2752568, 589825, 2, 2687032, 589825, 2, 2621496, 589825, 2, 2555960, 589825, 2, 2490424, 589825, 2, 2424888, 589825, 2, 2359352, 589825, 2, 2293816, 589825, 2, 2228280, 589825, 2, 2162744, 589825, 2, 2097208, 589825, 2, 2031672, 589825, 2, 1966136, 589825, 2, 1900600, 589825, 2, 1835064, 589825, 2, 1769528, 589825, 2, 1703992, 589825, 2, 1638456, 589825, 2, 1572920, 589825, 2, 1507384, 589825, 2, 1441848, 589825, 2, 1376312, 589825, 2, 1310776, 589825, 2, 1245240, 589825, 2, 1179704, 589825, 2, 1114168, 589825, 2, 1048632, 589825, 2, 983096, 589825, 2, 917560, 589825, 2, 852024, 589825, 2, 786488, 589825, 2, 720952, 589825, 2, 655416, 589825, 2, 589880, 589825, 2, 524344, 589825, 2, 458808, 589825, 2, 393272, 589825, 2, 327736, 589825, 2, 262200, 589825, 2, 196664, 589825, 2, 131128, 589825, 2, 65592, 589825, 2, 56, 589825, 2, -65480, 589825, 2, -131016, 589825, 2, -196552, 589825, 2, -262088, 589825, 2, -327624, 589825, 2, -393160, 589825, 2, -458696, 589825, 2, -524232, 589825, 2, -589768, 589825, 2, -655304, 655361, 0, 2949175, 589825, 3, 2883639, 589825, 2, 2818103, 589825, 2, 2752567, 589825, 2, 2687031, 589825, 2, 2621495, 589825, 2, 2555959, 589825, 2, 2490423, 589825, 2, 2424887, 589825, 2, 2359351, 589825, 2, 2293815, 589825, 2, 2228279, 589825, 2, 2162743, 589825, 2, 2097207, 589825, 2, 2031671, 589825, 2, 1966135, 589825, 2, 1900599, 589825, 2, 1835063, 589825, 2, 1769527, 589825, 2, 1703991, 589825, 2, 1638455, 589825, 2, 1572919, 589825, 2, 1507383, 589825, 2, 1441847, 589825, 2, 1376311, 589825, 2, 1310775, 589825, 2, 1245239, 589825, 2, 1179703, 589825, 2, 1114167, 589825, 2, 1048631, 589825, 2, 983095, 589825, 2, 917559, 589825, 2, 852023, 589825, 2, 786487, 589825, 2, 720951, 589825, 2, 655415, 589825, 2, 589879, 589825, 2, 524343, 589825, 2, 458807, 589825, 2, 393271, 589825, 2, 327735, 589825, 2, 262199, 589825, 2, 196663, 589825, 2, 131127, 589825, 2, 65591, 589825, 2, 55, 589825, 2, -65481, 589825, 2, -131017, 589825, 2, -196553, 589825, 2, -262089, 589825, 2, -327625, 589825, 2, -393161, 589825, 2, -458697, 589825, 2, -524233, 589825, 2, -589769, 589825, 2, -655305, 655361, 0, 2949174, 589825, 3, 2883638, 589825, 2, 2818102, 589825, 2, 2752566, 589825, 2, 2687030, 589825, 2, 2621494, 589825, 2, 2555958, 589825, 2, 2490422, 589825, 2, 2424886, 589825, 2, 2359350, 589825, 2, 2293814, 589825, 2, 2228278, 589825, 2, 2162742, 589825, 2, 2097206, 589825, 2, 2031670, 589825, 2, 1966134, 589825, 2, 1900598, 589825, 2, 1835062, 589825, 2, 1769526, 589825, 2, 1703990, 589825, 2, 1638454, 589825, 2, 1572918, 589825, 2, 1507382, 589825, 2, 1441846, 589825, 2, 1376310, 589825, 2, 1310774, 589825, 2, 1245238, 589825, 2, 1179702, 589825, 2, 1114166, 589825, 2, 1048630, 589825, 2, 983094, 589825, 2, 917558, 589825, 2, 852022, 589825, 2, 786486, 589825, 2, 720950, 589825, 2, 655414, 589825, 2, 589878, 589825, 2, 524342, 589825, 2, 458806, 589825, 2, 393270, 589825, 2, 327734, 589825, 2, 262198, 589825, 2, 196662, 589825, 2, 131126, 589825, 2, 65590, 589825, 2, 54, 589825, 2, -65482, 589825, 2, -131018, 589825, 2, -196554, 589825, 2, -262090, 589825, 2, -327626, 589825, 2, -393162, 589825, 2, -458698, 589825, 2, -524234, 589825, 2, -589770, 589825, 2, -655306, 655361, 0, 2949173, 589825, 3, 2883637, 589825, 2, 2818101, 589825, 2, 2752565, 589825, 2, 2687029, 589825, 2, 2621493, 589825, 2, 2555957, 589825, 2, 2490421, 589825, 2, 2424885, 589825, 2, 2359349, 589825, 2, 2293813, 589825, 2, 2228277, 589825, 2, 2162741, 589825, 2, 2097205, 589825, 2, 2031669, 589825, 2, 1966133, 589825, 2, 1900597, 589825, 2, 1835061, 589825, 2, 1769525, 589825, 2, 1703989, 589825, 2, 1638453, 589825, 2, 1572917, 589825, 2, 1507381, 589825, 2, 1441845, 589825, 2, 1376309, 589825, 2, 1310773, 589825, 2, 1245237, 589825, 2, 1179701, 589825, 2, 1114165, 589825, 2, 1048629, 589825, 2, 983093, 589825, 2, 917557, 589825, 2, 852021, 589825, 2, 786485, 589825, 2, 720949, 589825, 2, 655413, 589825, 2, 589877, 589825, 2, 524341, 589825, 2, 458805, 589825, 2, 393269, 589825, 2, 327733, 589825, 2, 262197, 589825, 2, 196661, 589825, 2, 131125, 589825, 2, 65589, 589825, 2, 53, 589825, 2, -65483, 589825, 2, -131019, 589825, 2, -196555, 589825, 2, -262091, 589825, 2, -327627, 589825, 2, -393163, 589825, 2, -458699, 589825, 2, -524235, 589825, 2, -589771, 589825, 2, -655307, 655361, 0, 2949172, 589825, 3, 2883636, 589825, 2, 2818100, 589825, 2, 2752564, 589825, 2, 2687028, 589825, 2, 2621492, 589825, 2, 2555956, 589825, 2, 2490420, 589825, 2, 2424884, 589825, 2, 2359348, 589825, 2, 2293812, 589825, 2, 2228276, 589825, 2, 2162740, 589825, 2, 2097204, 589825, 2, 2031668, 589825, 2, 1966132, 589825, 2, 1900596, 589825, 2, 1835060, 589825, 2, 1769524, 589825, 2, 1703988, 589825, 2, 1638452, 589825, 2, 1572916, 589825, 2, 1507380, 589825, 2, 1441844, 589825, 2, 1376308, 589825, 2, 1310772, 589825, 2, 1245236, 589825, 2, 1179700, 589825, 2, 1114164, 589825, 2, 1048628, 589825, 2, 983092, 589825, 2, 917556, 589825, 2, 852020, 589825, 2, 786484, 589825, 2, 720948, 589825, 2, 655412, 589825, 2, 589876, 589825, 2, 524340, 589825, 2, 458804, 589825, 2, 393268, 589825, 2, 327732, 589825, 2, 262196, 589825, 2, 196660, 589825, 2, 131124, 589825, 2, 65588, 589825, 2, 52, 589825, 2, -65484, 589825, 2, -131020, 589825, 2, -196556, 589825, 2, -262092, 589825, 2, -327628, 589825, 2, -393164, 589825, 2, -458700, 589825, 2, -524236, 589825, 2, -589772, 589825, 2, -655308, 655361, 0, 2949171, 589825, 3, 2883635, 589825, 2, 2818099, 589825, 2, 2752563, 589825, 2, 2687027, 589825, 2, 2621491, 589825, 2, 2555955, 589825, 2, 2490419, 589825, 2, 2424883, 589825, 2, 2359347, 589825, 2, 2293811, 589825, 2, 2228275, 589825, 2, 2162739, 589825, 2, 2097203, 589825, 2, 2031667, 589825, 2, 1966131, 589825, 2, 1900595, 589825, 2, 1835059, 589825, 2, 1769523, 589825, 2, 1703987, 589825, 2, 1638451, 589825, 2, 1572915, 589825, 2, 1507379, 589825, 2, 1441843, 589825, 2, 1376307, 589825, 2, 1310771, 589825, 2, 1245235, 589825, 2, 1179699, 589825, 2, 1114163, 589825, 2, 1048627, 589825, 2, 983091, 589825, 2, 917555, 589825, 2, 852019, 589825, 2, 786483, 589825, 2, 720947, 589825, 2, 655411, 589825, 2, 589875, 589825, 2, 524339, 589825, 2, 458803, 589825, 2, 393267, 589825, 2, 327731, 589825, 2, 262195, 589825, 2, 196659, 589825, 2, 131123, 589825, 2, 65587, 589825, 2, 51, 589825, 2, -65485, 589825, 2, -131021, 589825, 2, -196557, 589825, 2, -262093, 589825, 2, -327629, 589825, 2, -393165, 589825, 2, -458701, 589825, 2, -524237, 589825, 2, -589773, 589825, 2, -655309, 655361, 0, 2949170, 589825, 3, 2883634, 589825, 2, 2818098, 589825, 2, 2752562, 589825, 2, 2687026, 589825, 2, 2621490, 589825, 2, 2555954, 589825, 2, 2490418, 589825, 2, 2424882, 589825, 2, 2359346, 589825, 2, 2293810, 589825, 2, 2228274, 589825, 2, 2162738, 589825, 2, 2097202, 589825, 2, 2031666, 589825, 2, 1966130, 589825, 2, 1900594, 589825, 2, 1835058, 589825, 2, 1769522, 589825, 2, 1703986, 589825, 2, 1638450, 589825, 2, 1572914, 589825, 2, 1507378, 589825, 2, 1441842, 589825, 2, 1376306, 589825, 2, 1310770, 589825, 2, 1245234, 589825, 2, 1179698, 589825, 2, 1114162, 589825, 2, 1048626, 589825, 2, 983090, 589825, 2, 917554, 589825, 2, 852018, 589825, 2, 786482, 589825, 2, 720946, 589825, 2, 655410, 589825, 2, 589874, 589825, 2, 524338, 589825, 2, 458802, 589825, 2, 393266, 589825, 2, 327730, 589825, 2, 262194, 589825, 2, 196658, 589825, 2, 131122, 589825, 2, 65586, 589825, 2, 50, 589825, 2, -65486, 589825, 2, -131022, 589825, 2, -196558, 589825, 2, -262094, 589825, 2, -327630, 589825, 2, -393166, 589825, 2, -458702, 589825, 2, -524238, 589825, 2, -589774, 589825, 2, -655310, 655361, 0, 2949169, 589825, 3, 2883633, 589825, 2, 2818097, 589825, 2, 2752561, 589825, 2, 2687025, 589825, 2, 2621489, 589825, 2, 2555953, 589825, 2, 2490417, 589825, 2, 2424881, 589825, 2, 2359345, 589825, 2, 2293809, 589825, 2, 2228273, 589825, 2, 2162737, 589825, 2, 2097201, 589825, 2, 2031665, 589825, 2, 1966129, 589825, 2, 1900593, 589825, 2, 1835057, 589825, 2, 1769521, 589825, 2, 1703985, 589825, 2, 1638449, 589825, 2, 1572913, 589825, 2, 1507377, 589825, 2, 1441841, 589825, 2, 1376305, 589825, 2, 1310769, 589825, 2, 1245233, 589825, 2, 1179697, 589825, 2, 1114161, 589825, 2, 1048625, 589825, 2, 983089, 589825, 2, 917553, 589825, 2, 852017, 589825, 2, 786481, 589825, 2, 720945, 589825, 2, 655409, 589825, 2, 589873, 589825, 2, 524337, 589825, 2, 458801, 589825, 2, 393265, 589825, 2, 327729, 589825, 2, 262193, 589825, 2, 196657, 589825, 2, 131121, 589825, 2, 65585, 589825, 2, 49, 589825, 2, -65487, 589825, 2, -131023, 589825, 2, -196559, 589825, 2, -262095, 589825, 2, -327631, 589825, 2, -393167, 589825, 2, -458703, 589825, 2, -524239, 589825, 2, -589775, 589825, 2, -655311, 655361, 0, 2949168, 589825, 3, 2883632, 589825, 2, 2818096, 589825, 2, 2752560, 589825, 2, 2687024, 589825, 2, 2621488, 589825, 2, 2555952, 589825, 2, 2490416, 589825, 2, 2424880, 589825, 2, 2359344, 589825, 2, 2293808, 589825, 2, 2228272, 589825, 2, 2162736, 589825, 2, 2097200, 589825, 2, 2031664, 589825, 2, 1966128, 589825, 2, 1900592, 589825, 2, 1835056, 589825, 2, 1769520, 589825, 2, 1703984, 589825, 2, 1638448, 589825, 2, 1572912, 589825, 2, 1507376, 589825, 2, 1441840, 589825, 2, 1376304, 589825, 2, 1310768, 589825, 2, 1245232, 589825, 2, 1179696, 589825, 2, 1114160, 589825, 2, 1048624, 589825, 2, 983088, 589825, 2, 917552, 589825, 2, 852016, 589825, 2, 786480, 589825, 2, 720944, 589825, 2, 655408, 589825, 2, 589872, 589825, 2, 524336, 589825, 2, 458800, 589825, 2, 393264, 589825, 2, 327728, 589825, 2, 262192, 589825, 2, 196656, 589825, 2, 131120, 589825, 2, 65584, 589825, 2, 48, 589825, 2, -65488, 589825, 2, -131024, 589825, 2, -196560, 589825, 2, -262096, 589825, 2, -327632, 589825, 2, -393168, 589825, 2, -458704, 589825, 2, -524240, 589825, 2, -589776, 589825, 2, -655312, 655361, 0, 2949167, 589825, 3, 2883631, 589825, 2, 2818095, 589825, 2, 2752559, 589825, 2, 2687023, 589825, 2, 2621487, 589825, 2, 2555951, 589825, 2, 2490415, 589825, 2, 2424879, 589825, 2, 2359343, 589825, 2, 2293807, 589825, 2, 2228271, 589825, 2, 2162735, 589825, 2, 2097199, 589825, 2, 2031663, 589825, 2, 1966127, 589825, 2, 1900591, 589825, 2, 1835055, 589825, 2, 1769519, 589825, 2, 1703983, 589825, 2, 1638447, 589825, 2, 1572911, 589825, 2, 1507375, 589825, 2, 1441839, 589825, 2, 1376303, 589825, 2, 1310767, 589825, 2, 1245231, 589825, 2, 1179695, 589825, 2, 1114159, 589825, 2, 1048623, 589825, 2, 983087, 589825, 2, 917551, 589825, 2, 852015, 589825, 2, 786479, 589825, 2, 720943, 589825, 2, 655407, 589825, 2, 589871, 589825, 2, 524335, 589825, 2, 458799, 589825, 2, 393263, 589825, 2, 327727, 589825, 2, 262191, 589825, 2, 196655, 589825, 2, 131119, 589825, 2, 65583, 589825, 2, 47, 589825, 2, -65489, 589825, 2, -131025, 589825, 2, -196561, 589825, 2, -262097, 589825, 2, -327633, 589825, 2, -393169, 589825, 2, -458705, 589825, 2, -524241, 589825, 2, -589777, 589825, 2, -655313, 655361, 0, 2949166, 589825, 3, 2883630, 589825, 2, 2818094, 589825, 2, 2752558, 589825, 2, 2687022, 589825, 2, 2621486, 589825, 2, 2555950, 589825, 2, 2490414, 589825, 2, 2424878, 589825, 2, 2359342, 589825, 2, 2293806, 589825, 2, 2228270, 589825, 2, 2162734, 589825, 2, 2097198, 589825, 2, 2031662, 589825, 2, 1966126, 589825, 2, 1900590, 589825, 2, 1835054, 589825, 2, 1769518, 589825, 2, 1703982, 589825, 2, 1638446, 589825, 2, 1572910, 589825, 2, 1507374, 589825, 2, 1441838, 589825, 2, 1376302, 589825, 2, 1310766, 589825, 2, 1245230, 589825, 2, 1179694, 589825, 2, 1114158, 589825, 2, 1048622, 589825, 2, 983086, 589825, 2, 917550, 589825, 2, 852014, 589825, 2, 786478, 589825, 2, 720942, 589825, 2, 655406, 589825, 2, 589870, 589825, 2, 524334, 589825, 2, 458798, 589825, 2, 393262, 589825, 2, 327726, 589825, 2, 262190, 589825, 2, 196654, 589825, 2, 131118, 589825, 2, 65582, 589825, 2, 46, 589825, 2, -65490, 589825, 2, -131026, 589825, 2, -196562, 589825, 2, -262098, 589825, 2, -327634, 589825, 2, -393170, 589825, 2, -458706, 589825, 2, -524242, 589825, 2, -589778, 589825, 2, -655314, 655361, 0, 2949165, 589825, 3, 2883629, 589825, 2, 2818093, 589825, 2, 2752557, 589825, 2, 2687021, 589825, 2, 2621485, 589825, 2, 2555949, 589825, 2, 2490413, 589825, 2, 2424877, 589825, 2, 2359341, 589825, 2, 2293805, 589825, 2, 2228269, 589825, 2, 2162733, 589825, 2, 2097197, 589825, 2, 2031661, 589825, 2, 1966125, 589825, 2, 1900589, 589825, 2, 1835053, 589825, 2, 1769517, 589825, 2, 1703981, 589825, 2, 1638445, 589825, 2, 1572909, 589825, 2, 1507373, 589825, 2, 1441837, 589825, 2, 1376301, 589825, 2, 1310765, 589825, 2, 1245229, 589825, 2, 1179693, 589825, 2, 1114157, 589825, 2, 1048621, 589825, 2, 983085, 589825, 2, 917549, 589825, 2, 852013, 589825, 2, 786477, 589825, 2, 720941, 589825, 2, 655405, 589825, 2, 589869, 589825, 2, 524333, 589825, 2, 458797, 589825, 2, 393261, 589825, 2, 327725, 589825, 2, 262189, 589825, 2, 196653, 589825, 2, 131117, 589825, 2, 65581, 589825, 2, 45, 589825, 2, -65491, 589825, 2, -131027, 589825, 2, -196563, 589825, 2, -262099, 589825, 2, -327635, 589825, 2, -393171, 589825, 2, -458707, 589825, 2, -524243, 589825, 2, -589779, 589825, 2, -655315, 655361, 0, 2949164, 589825, 3, 2883628, 589825, 2, 2818092, 589825, 2, 2752556, 589825, 2, 2687020, 589825, 2, 2621484, 589825, 2, 2555948, 589825, 2, 2490412, 589825, 2, 2424876, 589825, 2, 2359340, 589825, 2, 2293804, 589825, 2, 2228268, 589825, 2, 2162732, 589825, 2, 2097196, 589825, 2, 2031660, 589825, 2, 1966124, 589825, 2, 1900588, 589825, 2, 1835052, 589825, 2, 1769516, 589825, 2, 1703980, 589825, 2, 1638444, 589825, 2, 1572908, 589825, 2, 1507372, 589825, 2, 1441836, 589825, 2, 1376300, 589825, 2, 1310764, 589825, 2, 1245228, 589825, 2, 1179692, 589825, 2, 1114156, 589825, 2, 1048620, 589825, 2, 983084, 589825, 2, 917548, 589825, 2, 852012, 589825, 2, 786476, 589825, 2, 720940, 589825, 2, 655404, 589825, 2, 589868, 589825, 2, 524332, 589825, 2, 458796, 589825, 2, 393260, 589825, 2, 327724, 589825, 2, 262188, 589825, 2, 196652, 589825, 2, 131116, 589825, 2, 65580, 589825, 2, 44, 589825, 2, -65492, 589825, 2, -131028, 589825, 2, -196564, 589825, 2, -262100, 589825, 2, -327636, 589825, 2, -393172, 589825, 2, -458708, 589825, 2, -524244, 589825, 2, -589780, 589825, 2, -655316, 655361, 0, 2949163, 589825, 3, 2883627, 589825, 2, 2818091, 589825, 2, 2752555, 589825, 2, 2687019, 589825, 2, 2621483, 589825, 2, 2555947, 589825, 2, 2490411, 589825, 2, 2424875, 589825, 2, 2359339, 589825, 2, 2293803, 589825, 2, 2228267, 589825, 2, 2162731, 589825, 2, 2097195, 589825, 2, 2031659, 589825, 2, 1966123, 589825, 2, 1900587, 589825, 2, 1835051, 589825, 2, 1769515, 589825, 2, 1703979, 589825, 2, 1638443, 589825, 2, 1572907, 589825, 2, 1507371, 589825, 2, 1441835, 589825, 2, 1376299, 589825, 2, 1310763, 589825, 2, 1245227, 589825, 2, 1179691, 589825, 2, 1114155, 589825, 2, 1048619, 589825, 2, 983083, 589825, 2, 917547, 589825, 2, 852011, 589825, 2, 786475, 589825, 2, 720939, 589825, 2, 655403, 589825, 2, 589867, 589825, 2, 524331, 589825, 2, 458795, 589825, 2, 393259, 589825, 2, 327723, 589825, 2, 262187, 589825, 2, 196651, 589825, 2, 131115, 589825, 2, 65579, 589825, 2, 43, 589825, 2, -65493, 589825, 2, -131029, 589825, 2, -196565, 589825, 2, -262101, 589825, 2, -327637, 589825, 2, -393173, 589825, 2, -458709, 589825, 2, -524245, 589825, 2, -589781, 589825, 2, -655317, 655361, 0, 2949162, 589825, 3, 2883626, 589825, 2, 2818090, 589825, 2, 2752554, 589825, 2, 2687018, 589825, 2, 2621482, 589825, 2, 2555946, 589825, 2, 2490410, 589825, 2, 2424874, 589825, 2, 2359338, 589825, 2, 2293802, 589825, 2, 2228266, 589825, 2, 2162730, 589825, 2, 2097194, 589825, 2, 2031658, 589825, 2, 1966122, 589825, 2, 1900586, 589825, 2, 1835050, 589825, 2, 1769514, 589825, 2, 1703978, 589825, 2, 1638442, 589825, 2, 1572906, 589825, 2, 1507370, 589825, 2, 1441834, 589825, 2, 1376298, 589825, 2, 1310762, 589825, 2, 1245226, 589825, 2, 1179690, 589825, 2, 1114154, 589825, 2, 1048618, 589825, 2, 983082, 589825, 2, 917546, 589825, 2, 852010, 589825, 2, 786474, 589825, 2, 720938, 589825, 2, 655402, 589825, 2, 589866, 589825, 2, 524330, 589825, 2, 458794, 589825, 2, 393258, 589825, 2, 327722, 589825, 2, 262186, 589825, 2, 196650, 589825, 2, 131114, 589825, 2, 65578, 589825, 2, 42, 589825, 2, -65494, 589825, 2, -131030, 589825, 2, -196566, 589825, 2, -262102, 589825, 2, -327638, 589825, 2, -393174, 589825, 2, -458710, 589825, 2, -524246, 589825, 2, -589782, 589825, 2, -655318, 655361, 0, 2949161, 589825, 3, 2883625, 589825, 2, 2818089, 589825, 2, 2752553, 589825, 2, 2687017, 589825, 2, 2621481, 589825, 2, 2555945, 589825, 2, 2490409, 589825, 2, 2424873, 589825, 2, 2359337, 589825, 2, 2293801, 589825, 2, 2228265, 589825, 2, 2162729, 589825, 2, 2097193, 589825, 2, 2031657, 589825, 2, 1966121, 589825, 2, 1900585, 589825, 2, 1835049, 589825, 2, 1769513, 589825, 2, 1703977, 589825, 2, 1638441, 589825, 2, 1572905, 589825, 2, 1507369, 589825, 2, 1441833, 589825, 2, 1376297, 589825, 2, 1310761, 589825, 2, 1245225, 589825, 2, 1179689, 589825, 2, 1114153, 589825, 2, 1048617, 589825, 2, 983081, 589825, 2, 917545, 589825, 2, 852009, 589825, 2, 786473, 589825, 2, 720937, 589825, 2, 655401, 589825, 2, 589865, 589825, 2, 524329, 589825, 2, 458793, 589825, 2, 393257, 589825, 2, 327721, 589825, 2, 262185, 589825, 2, 196649, 589825, 2, 131113, 589825, 2, 65577, 589825, 2, 41, 589825, 2, -65495, 589825, 2, -131031, 589825, 2, -196567, 589825, 2, -262103, 589825, 2, -327639, 589825, 2, -393175, 589825, 2, -458711, 589825, 2, -524247, 589825, 2, -589783, 589825, 2, -655319, 655361, 0, 2949160, 589825, 3, 2883624, 589825, 2, 2818088, 589825, 2, 2752552, 589825, 2, 2687016, 589825, 2, 2621480, 589825, 2, 2555944, 589825, 2, 2490408, 589825, 2, 2424872, 589825, 2, 2359336, 589825, 2, 2293800, 589825, 2, 2228264, 589825, 2, 2162728, 589825, 2, 2097192, 589825, 2, 2031656, 589825, 2, 1966120, 589825, 2, 1900584, 589825, 2, 1835048, 589825, 2, 1769512, 589825, 2, 1703976, 589825, 2, 1638440, 589825, 2, 1572904, 589825, 2, 1507368, 589825, 2, 1441832, 589825, 2, 1376296, 589825, 2, 1310760, 589825, 2, 1245224, 589825, 2, 1179688, 589825, 2, 1114152, 589825, 2, 1048616, 589825, 2, 983080, 589825, 2, 917544, 589825, 2, 852008, 589825, 2, 786472, 589825, 2, 720936, 589825, 2, 655400, 589825, 2, 589864, 589825, 2, 524328, 589825, 2, 458792, 589825, 2, 393256, 589825, 2, 327720, 589825, 2, 262184, 589825, 2, 196648, 589825, 2, 131112, 589825, 2, 65576, 589825, 2, 40, 589825, 2, -65496, 589825, 2, -131032, 589825, 2, -196568, 589825, 2, -262104, 589825, 2, -327640, 589825, 2, -393176, 589825, 2, -458712, 589825, 2, -524248, 589825, 2, -589784, 589825, 2, -655320, 655361, 0, 2949159, 589825, 3, 2883623, 589825, 2, 2818087, 589825, 2, 2752551, 589825, 2, 2687015, 589825, 2, 2621479, 589825, 2, 2555943, 589825, 2, 2490407, 589825, 2, 2424871, 589825, 2, 2359335, 589825, 2, 2293799, 589825, 2, 2228263, 589825, 2, 2162727, 589825, 2, 2097191, 589825, 2, 2031655, 589825, 2, 1966119, 589825, 2, 1900583, 589825, 2, 1835047, 589825, 2, 1769511, 589825, 2, 1703975, 589825, 2, 1638439, 589825, 2, 1572903, 589825, 2, 1507367, 589825, 2, 1441831, 589825, 2, 1376295, 589825, 2, 1310759, 589825, 2, 1245223, 589825, 2, 1179687, 589825, 2, 1114151, 589825, 2, 1048615, 589825, 2, 983079, 589825, 2, 917543, 589825, 2, 852007, 589825, 2, 786471, 589825, 2, 720935, 589825, 2, 655399, 589825, 2, 589863, 589825, 2, 524327, 589825, 2, 458791, 589825, 2, 393255, 589825, 2, 327719, 589825, 2, 262183, 589825, 2, 196647, 589825, 2, 131111, 589825, 2, 65575, 589825, 2, 39, 589825, 2, -65497, 589825, 2, -131033, 589825, 2, -196569, 589825, 2, -262105, 589825, 2, -327641, 589825, 2, -393177, 589825, 2, -458713, 589825, 2, -524249, 589825, 2, -589785, 589825, 2, -655321, 655361, 0, 2949158, 589825, 3, 2883622, 589825, 2, 2818086, 589825, 2, 2752550, 589825, 2, 2687014, 589825, 2, 2621478, 589825, 2, 2555942, 589825, 2, 2490406, 589825, 2, 2424870, 589825, 2, 2359334, 589825, 2, 2293798, 589825, 2, 2228262, 589825, 2, 2162726, 589825, 2, 2097190, 589825, 2, 2031654, 589825, 2, 1966118, 589825, 2, 1900582, 589825, 2, 1835046, 589825, 2, 1769510, 589825, 2, 1703974, 589825, 2, 1638438, 589825, 2, 1572902, 589825, 2, 1507366, 589825, 2, 1441830, 589825, 2, 1376294, 589825, 2, 1310758, 589825, 2, 1245222, 589825, 2, 1179686, 589825, 2, 1114150, 589825, 2, 1048614, 589825, 2, 983078, 589825, 2, 917542, 589825, 2, 852006, 589825, 2, 786470, 589825, 2, 720934, 589825, 2, 655398, 589825, 2, 589862, 589825, 2, 524326, 589825, 2, 458790, 589825, 2, 393254, 589825, 2, 327718, 589825, 2, 262182, 589825, 2, 196646, 589825, 2, 131110, 589825, 2, 65574, 589825, 2, 38, 589825, 2, -65498, 589825, 2, -131034, 589825, 2, -196570, 589825, 2, -262106, 589825, 2, -327642, 589825, 2, -393178, 589825, 2, -458714, 589825, 2, -524250, 589825, 2, -589786, 589825, 2, -655322, 655361, 0, 2949157, 589825, 3, 2883621, 589825, 2, 2818085, 589825, 2, 2752549, 589825, 2, 2687013, 589825, 2, 2621477, 589825, 2, 2555941, 589825, 2, 2490405, 589825, 2, 2424869, 589825, 2, 2359333, 589825, 2, 2293797, 589825, 2, 2228261, 589825, 2, 2162725, 589825, 2, 2097189, 589825, 2, 2031653, 589825, 2, 1966117, 589825, 2, 1900581, 589825, 2, 1835045, 589825, 2, 1769509, 589825, 2, 1703973, 589825, 2, 1638437, 589825, 2, 1572901, 589825, 2, 1507365, 589825, 2, 1441829, 589825, 2, 1376293, 589825, 2, 1310757, 589825, 2, 1245221, 589825, 2, 1179685, 589825, 2, 1114149, 589825, 2, 1048613, 589825, 2, 983077, 589825, 2, 917541, 589825, 2, 852005, 589825, 2, 786469, 589825, 2, 720933, 589825, 2, 655397, 589825, 2, 589861, 589825, 2, 524325, 589825, 2, 458789, 589825, 2, 393253, 589825, 2, 327717, 589825, 2, 262181, 589825, 2, 196645, 589825, 2, 131109, 589825, 2, 65573, 589825, 2, 37, 589825, 2, -65499, 589825, 2, -131035, 589825, 2, -196571, 589825, 2, -262107, 589825, 2, -327643, 589825, 2, -393179, 589825, 2, -458715, 589825, 2, -524251, 589825, 2, -589787, 589825, 2, -655323, 655361, 0, 2949156, 589825, 3, 2883620, 589825, 2, 2818084, 589825, 2, 2752548, 589825, 2, 2687012, 589825, 2, 2621476, 589825, 2, 2555940, 589825, 2, 2490404, 589825, 2, 2424868, 589825, 2, 2359332, 589825, 2, 2293796, 589825, 2, 2228260, 589825, 2, 2162724, 589825, 2, 2097188, 589825, 2, 2031652, 589825, 2, 1966116, 589825, 2, 1900580, 589825, 2, 1835044, 589825, 2, 1769508, 589825, 2, 1703972, 589825, 2, 1638436, 589825, 2, 1572900, 589825, 2, 1507364, 589825, 2, 1441828, 589825, 2, 1376292, 589825, 2, 1310756, 589825, 2, 1245220, 589825, 2, 1179684, 589825, 2, 1114148, 589825, 2, 1048612, 589825, 2, 983076, 589825, 2, 917540, 589825, 2, 852004, 589825, 2, 786468, 589825, 2, 720932, 589825, 2, 655396, 589825, 2, 589860, 589825, 2, 524324, 589825, 2, 458788, 589825, 2, 393252, 589825, 2, 327716, 589825, 2, 262180, 589825, 2, 196644, 589825, 2, 131108, 589825, 2, 65572, 589825, 2, 36, 589825, 2, -65500, 589825, 2, -131036, 589825, 2, -196572, 589825, 2, -262108, 589825, 2, -327644, 589825, 2, -393180, 589825, 2, -458716, 589825, 2, -524252, 589825, 2, -589788, 589825, 2, -655324, 655361, 0, 2949155, 589825, 3, 2883619, 589825, 2, 2818083, 589825, 2, 2752547, 589825, 2, 2687011, 589825, 2, 2621475, 589825, 2, 2555939, 589825, 2, 2490403, 589825, 2, 2424867, 589825, 2, 2359331, 589825, 2, 2293795, 589825, 2, 2228259, 589825, 2, 2162723, 589825, 2, 2097187, 589825, 2, 2031651, 589825, 2, 1966115, 589825, 2, 1900579, 589825, 2, 1835043, 589825, 2, 1769507, 589825, 2, 1703971, 589825, 2, 1638435, 589825, 2, 1572899, 589825, 2, 1507363, 589825, 2, 1441827, 589825, 2, 1376291, 589825, 2, 1310755, 589825, 2, 1245219, 589825, 2, 1179683, 589825, 2, 1114147, 589825, 2, 1048611, 589825, 2, 983075, 589825, 2, 917539, 589825, 2, 852003, 589825, 2, 786467, 589825, 2, 720931, 589825, 2, 655395, 589825, 2, 589859, 589825, 2, 524323, 589825, 2, 458787, 589825, 2, 393251, 589825, 2, 327715, 589825, 2, 262179, 589825, 2, 196643, 589825, 2, 131107, 589825, 2, 65571, 589825, 2, 35, 589825, 2, -65501, 589825, 2, -131037, 589825, 2, -196573, 589825, 2, -262109, 589825, 2, -327645, 589825, 2, -393181, 589825, 2, -458717, 589825, 2, -524253, 589825, 2, -589789, 589825, 2, -655325, 655361, 0, 2949154, 589825, 3, 2883618, 589825, 2, 2818082, 589825, 2, 2752546, 589825, 2, 2687010, 589825, 2, 2621474, 589825, 2, 2555938, 589825, 2, 2490402, 589825, 2, 2424866, 589825, 2, 2359330, 589825, 2, 2293794, 589825, 2, 2228258, 589825, 2, 2162722, 589825, 2, 2097186, 589825, 2, 2031650, 589825, 2, 1966114, 589825, 2, 1900578, 589825, 2, 1835042, 589825, 2, 1769506, 589825, 2, 1703970, 589825, 2, 1638434, 589825, 2, 1572898, 589825, 2, 1507362, 589825, 2, 1441826, 589825, 2, 1376290, 589825, 2, 1310754, 589825, 2, 1245218, 589825, 2, 1179682, 589825, 2, 1114146, 589825, 2, 1048610, 589825, 2, 983074, 589825, 2, 917538, 589825, 2, 852002, 589825, 2, 786466, 589825, 2, 720930, 589825, 2, 655394, 589825, 2, 589858, 589825, 2, 524322, 589825, 2, 458786, 589825, 2, 393250, 589825, 2, 327714, 589825, 2, 262178, 589825, 2, 196642, 589825, 2, 131106, 589825, 2, 65570, 589825, 2, 34, 589825, 2, -65502, 589825, 2, -131038, 589825, 2, -196574, 589825, 2, -262110, 589825, 2, -327646, 589825, 2, -393182, 589825, 2, -458718, 589825, 2, -524254, 589825, 2, -589790, 589825, 2, -655326, 655361, 0, 2949153, 589825, 3, 2883617, 589825, 2, 2818081, 589825, 2, 2752545, 589825, 2, 2687009, 589825, 2, 2621473, 589825, 2, 2555937, 589825, 2, 2490401, 589825, 2, 2424865, 589825, 2, 2359329, 589825, 2, 2293793, 589825, 2, 2228257, 589825, 2, 2162721, 589825, 2, 2097185, 589825, 2, 2031649, 589825, 2, 1966113, 589825, 2, 1900577, 589825, 2, 1835041, 589825, 2, 1769505, 589825, 2, 1703969, 589825, 2, 1638433, 589825, 2, 1572897, 589825, 2, 1507361, 589825, 2, 1441825, 589825, 2, 1376289, 589825, 2, 1310753, 589825, 2, 1245217, 589825, 2, 1179681, 589825, 2, 1114145, 589825, 2, 1048609, 589825, 2, 983073, 589825, 2, 917537, 589825, 2, 852001, 589825, 2, 786465, 589825, 2, 720929, 589825, 2, 655393, 589825, 2, 589857, 589825, 2, 524321, 589825, 2, 458785, 589825, 2, 393249, 589825, 2, 327713, 589825, 2, 262177, 589825, 2, 196641, 589825, 2, 131105, 589825, 2, 65569, 589825, 2, 33, 589825, 2, -65503, 589825, 2, -131039, 589825, 2, -196575, 589825, 2, -262111, 589825, 2, -327647, 589825, 2, -393183, 589825, 2, -458719, 589825, 2, -524255, 589825, 2, -589791, 589825, 2, -655327, 655361, 0, 2949152, 589825, 3, 2883616, 589825, 2, 2818080, 589825, 2, 2752544, 589825, 2, 2687008, 589825, 2, 2621472, 589825, 2, 2555936, 589825, 2, 2490400, 589825, 2, 2424864, 589825, 2, 2359328, 589825, 2, 2293792, 589825, 2, 2228256, 589825, 2, 2162720, 589825, 2, 2097184, 589825, 2, 2031648, 589825, 2, 1966112, 589825, 2, 1900576, 589825, 2, 1835040, 589825, 2, 1769504, 589825, 2, 1703968, 589825, 2, 1638432, 589825, 2, 1572896, 589825, 2, 1507360, 589825, 2, 1441824, 589825, 2, 1376288, 589825, 2, 1310752, 589825, 2, 1245216, 589825, 2, 1179680, 589825, 2, 1114144, 589825, 2, 1048608, 589825, 2, 983072, 589825, 2, 917536, 589825, 2, 852000, 589825, 2, 786464, 589825, 2, 720928, 589825, 2, 655392, 589825, 2, 589856, 589825, 2, 524320, 589825, 2, 458784, 589825, 2, 393248, 589825, 2, 327712, 589825, 2, 262176, 589825, 2, 196640, 589825, 2, 131104, 589825, 2, 65568, 589825, 2, 32, 589825, 2, -65504, 589825, 2, -131040, 589825, 2, -196576, 589825, 2, -262112, 589825, 2, -327648, 589825, 2, -393184, 589825, 2, -458720, 589825, 2, -524256, 589825, 2, -589792, 589825, 2, -655328, 655361, 0, 2949151, 589825, 3, 2883615, 589825, 2, 2818079, 589825, 2, 2752543, 589825, 2, 2687007, 589825, 2, 2621471, 589825, 2, 2555935, 589825, 2, 2490399, 589825, 2, 2424863, 589825, 2, 2359327, 589825, 2, 2293791, 589825, 2, 2228255, 589825, 2, 2162719, 589825, 2, 2097183, 589825, 2, 2031647, 589825, 2, 1966111, 589825, 2, 1900575, 589825, 2, 1835039, 589825, 2, 1769503, 589825, 2, 1703967, 589825, 2, 1638431, 589825, 2, 1572895, 589825, 2, 1507359, 589825, 2, 1441823, 589825, 2, 1376287, 589825, 2, 1310751, 589825, 2, 1245215, 589825, 2, 1179679, 589825, 2, 1114143, 589825, 2, 1048607, 589825, 2, 983071, 589825, 2, 917535, 589825, 2, 851999, 589825, 2, 786463, 589825, 2, 720927, 589825, 2, 655391, 589825, 2, 589855, 589825, 2, 524319, 589825, 2, 458783, 589825, 2, 393247, 589825, 2, 327711, 589825, 2, 262175, 589825, 2, 196639, 589825, 2, 131103, 589825, 2, 65567, 589825, 2, 31, 589825, 2, -65505, 589825, 2, -131041, 589825, 2, -196577, 589825, 2, -262113, 589825, 2, -327649, 589825, 2, -393185, 589825, 2, -458721, 589825, 2, -524257, 589825, 2, -589793, 589825, 2, -655329, 655361, 0, 2949150, 589825, 3, 2883614, 589825, 2, 2818078, 589825, 2, 2752542, 589825, 2, 2687006, 589825, 2, 2621470, 589825, 2, 2555934, 589825, 2, 2490398, 589825, 2, 2424862, 589825, 2, 2359326, 589825, 2, 2293790, 589825, 2, 2228254, 589825, 2, 2162718, 589825, 2, 2097182, 589825, 2, 2031646, 589825, 2, 1966110, 589825, 2, 1900574, 589825, 2, 1835038, 589825, 2, 1769502, 589825, 2, 1703966, 589825, 2, 1638430, 589825, 2, 1572894, 589825, 2, 1507358, 589825, 2, 1441822, 589825, 2, 1376286, 589825, 2, 1310750, 589825, 2, 1245214, 589825, 2, 1179678, 589825, 2, 1114142, 589825, 2, 1048606, 589825, 2, 983070, 589825, 2, 917534, 589825, 2, 851998, 589825, 2, 786462, 589825, 2, 720926, 589825, 2, 655390, 589825, 2, 589854, 589825, 2, 524318, 589825, 2, 458782, 589825, 2, 393246, 589825, 2, 327710, 589825, 2, 262174, 589825, 2, 196638, 589825, 2, 131102, 589825, 2, 65566, 589825, 2, 30, 589825, 2, -65506, 589825, 2, -131042, 589825, 2, -196578, 589825, 2, -262114, 589825, 2, -327650, 589825, 2, -393186, 589825, 2, -458722, 589825, 2, -524258, 589825, 2, -589794, 589825, 2, -655330, 655361, 0, 2949149, 589825, 3, 2883613, 589825, 2, 2818077, 589825, 2, 2752541, 589825, 2, 2687005, 589825, 2, 2621469, 589825, 2, 2555933, 589825, 2, 2490397, 589825, 2, 2424861, 589825, 2, 2359325, 589825, 2, 2293789, 589825, 2, 2228253, 589825, 2, 2162717, 589825, 2, 2097181, 589825, 2, 2031645, 589825, 2, 1966109, 589825, 2, 1900573, 589825, 2, 1835037, 589825, 2, 1769501, 589825, 2, 1703965, 589825, 2, 1638429, 589825, 2, 1572893, 589825, 2, 1507357, 589825, 2, 1441821, 589825, 2, 1376285, 589825, 2, 1310749, 589825, 2, 1245213, 589825, 2, 1179677, 589825, 2, 1114141, 589825, 2, 1048605, 589825, 2, 983069, 589825, 2, 917533, 589825, 2, 851997, 589825, 2, 786461, 589825, 2, 720925, 589825, 2, 655389, 589825, 2, 589853, 589825, 2, 524317, 589825, 2, 458781, 589825, 2, 393245, 589825, 2, 327709, 589825, 2, 262173, 589825, 2, 196637, 589825, 2, 131101, 589825, 2, 65565, 589825, 2, 29, 589825, 2, -65507, 589825, 2, -131043, 589825, 2, -196579, 589825, 2, -262115, 589825, 2, -327651, 589825, 2, -393187, 589825, 2, -458723, 589825, 2, -524259, 589825, 2, -589795, 589825, 2, -655331, 655361, 0, 2949148, 589825, 3, 2883612, 589825, 2, 2818076, 589825, 2, 2752540, 589825, 2, 2687004, 589825, 2, 2621468, 589825, 2, 2555932, 589825, 2, 2490396, 589825, 2, 2424860, 589825, 2, 2359324, 589825, 2, 2293788, 589825, 2, 2228252, 589825, 2, 2162716, 589825, 2, 2097180, 589825, 2, 2031644, 589825, 2, 1966108, 589825, 2, 1900572, 589825, 2, 1835036, 589825, 2, 1769500, 589825, 2, 1703964, 589825, 2, 1638428, 589825, 2, 1572892, 589825, 2, 1507356, 589825, 2, 1441820, 589825, 2, 1376284, 589825, 2, 1310748, 589825, 2, 1245212, 589825, 2, 1179676, 589825, 2, 1114140, 589825, 2, 1048604, 589825, 2, 983068, 589825, 2, 917532, 589825, 2, 851996, 589825, 2, 786460, 589825, 2, 720924, 589825, 2, 655388, 589825, 2, 589852, 589825, 2, 524316, 589825, 2, 458780, 589825, 2, 393244, 589825, 2, 327708, 589825, 2, 262172, 589825, 2, 196636, 589825, 2, 131100, 589825, 2, 65564, 589825, 2, 28, 589825, 2, -65508, 589825, 2, -131044, 589825, 2, -196580, 589825, 2, -262116, 589825, 2, -327652, 589825, 2, -393188, 589825, 2, -458724, 589825, 2, -524260, 589825, 2, -589796, 589825, 2, -655332, 655361, 0, 2949147, 589825, 3, 2883611, 589825, 2, 2818075, 589825, 2, 2752539, 589825, 2, 2687003, 589825, 2, 2621467, 589825, 2, 2555931, 589825, 2, 2490395, 589825, 2, 2424859, 589825, 2, 2359323, 589825, 2, 2293787, 589825, 2, 2228251, 589825, 2, 2162715, 589825, 2, 2097179, 589825, 2, 2031643, 589825, 2, 1966107, 589825, 2, 1900571, 589825, 2, 1835035, 589825, 2, 1769499, 589825, 2, 1703963, 589825, 2, 1638427, 589825, 2, 1572891, 589825, 2, 1507355, 589825, 2, 1441819, 589825, 2, 1376283, 589825, 2, 1310747, 589825, 2, 1245211, 589825, 2, 1179675, 589825, 2, 1114139, 589825, 2, 1048603, 589825, 2, 983067, 589825, 2, 917531, 589825, 2, 851995, 589825, 2, 786459, 589825, 2, 720923, 589825, 2, 655387, 589825, 2, 589851, 589825, 2, 524315, 589825, 2, 458779, 589825, 2, 393243, 589825, 2, 327707, 589825, 2, 262171, 589825, 2, 196635, 589825, 2, 131099, 589825, 2, 65563, 589825, 2, 27, 589825, 2, -65509, 589825, 2, -131045, 589825, 2, -196581, 589825, 2, -262117, 589825, 2, -327653, 589825, 2, -393189, 589825, 2, -458725, 589825, 2, -524261, 589825, 2, -589797, 589825, 2, -655333, 655361, 0, 2949146, 589825, 3, 2883610, 589825, 2, 2818074, 589825, 2, 2752538, 589825, 2, 2687002, 589825, 2, 2621466, 589825, 2, 2555930, 589825, 2, 2490394, 589825, 2, 2424858, 589825, 2, 2359322, 589825, 2, 2293786, 589825, 2, 2228250, 589825, 2, 2162714, 589825, 2, 2097178, 589825, 2, 2031642, 589825, 2, 1966106, 589825, 2, 1900570, 589825, 2, 1835034, 589825, 2, 1769498, 589825, 2, 1703962, 589825, 2, 1638426, 589825, 2, 1572890, 589825, 2, 1507354, 589825, 2, 1441818, 589825, 2, 1376282, 589825, 2, 1310746, 589825, 2, 1245210, 589825, 2, 1179674, 589825, 2, 1114138, 589825, 2, 1048602, 589825, 2, 983066, 589825, 2, 917530, 589825, 2, 851994, 589825, 2, 786458, 589825, 2, 720922, 589825, 2, 655386, 589825, 2, 589850, 589825, 2, 524314, 589825, 2, 458778, 589825, 2, 393242, 589825, 2, 327706, 589825, 2, 262170, 589825, 2, 196634, 589825, 2, 131098, 589825, 2, 65562, 589825, 2, 26, 589825, 2, -65510, 589825, 2, -131046, 589825, 2, -196582, 589825, 2, -262118, 589825, 2, -327654, 589825, 2, -393190, 589825, 2, -458726, 589825, 2, -524262, 589825, 2, -589798, 589825, 2, -655334, 655361, 0, 2949145, 589825, 3, 2883609, 589825, 2, 2818073, 589825, 2, 2752537, 589825, 2, 2687001, 589825, 2, 2621465, 589825, 2, 2555929, 589825, 2, 2490393, 589825, 2, 2424857, 589825, 2, 2359321, 589825, 2, 2293785, 589825, 2, 2228249, 589825, 2, 2162713, 589825, 2, 2097177, 589825, 2, 2031641, 589825, 2, 1966105, 589825, 2, 1900569, 589825, 2, 1835033, 589825, 2, 1769497, 589825, 2, 1703961, 589825, 2, 1638425, 589825, 2, 1572889, 589825, 2, 1507353, 589825, 2, 1441817, 589825, 2, 1376281, 589825, 2, 1310745, 589825, 2, 1245209, 589825, 2, 1179673, 589825, 2, 1114137, 589825, 2, 1048601, 589825, 2, 983065, 589825, 2, 917529, 589825, 2, 851993, 589825, 2, 786457, 589825, 2, 720921, 589825, 2, 655385, 589825, 2, 589849, 589825, 2, 524313, 589825, 2, 458777, 589825, 2, 393241, 589825, 2, 327705, 589825, 2, 262169, 589825, 2, 196633, 589825, 2, 131097, 589825, 2, 65561, 589825, 2, 25, 589825, 2, -65511, 589825, 2, -131047, 589825, 2, -196583, 589825, 2, -262119, 589825, 2, -327655, 589825, 2, -393191, 589825, 2, -458727, 589825, 2, -524263, 589825, 2, -589799, 589825, 2, -655335, 655361, 0, 2949144, 589825, 3, 2883608, 589825, 2, 2818072, 589825, 2, 2752536, 589825, 2, 2687000, 589825, 2, 2621464, 589825, 2, 2555928, 589825, 2, 2490392, 589825, 2, 2424856, 589825, 2, 2359320, 589825, 2, 2293784, 589825, 2, 2228248, 589825, 2, 2162712, 589825, 2, 2097176, 589825, 2, 2031640, 589825, 2, 1966104, 589825, 2, 1900568, 589825, 2, 1835032, 589825, 2, 1769496, 589825, 2, 1703960, 589825, 2, 1638424, 589825, 2, 1572888, 589825, 2, 1507352, 589825, 2, 1441816, 589825, 2, 1376280, 589825, 2, 1310744, 589825, 2, 1245208, 589825, 2, 1179672, 589825, 2, 1114136, 589825, 2, 1048600, 589825, 2, 983064, 589825, 2, 917528, 589825, 2, 851992, 589825, 2, 786456, 589825, 2, 720920, 589825, 2, 655384, 589825, 2, 589848, 589825, 2, 524312, 589825, 2, 458776, 589825, 2, 393240, 589825, 2, 327704, 589825, 2, 262168, 589825, 2, 196632, 589825, 2, 131096, 589825, 2, 65560, 589825, 2, 24, 589825, 2, -65512, 589825, 2, -131048, 589825, 2, -196584, 589825, 2, -262120, 589825, 2, -327656, 589825, 2, -393192, 589825, 2, -458728, 589825, 2, -524264, 589825, 2, -589800, 589825, 2, -655336, 655361, 0, 2949143, 589825, 3, 2883607, 589825, 2, 2818071, 589825, 2, 2752535, 589825, 2, 2686999, 589825, 2, 2621463, 589825, 2, 2555927, 589825, 2, 2490391, 589825, 2, 2424855, 589825, 2, 2359319, 589825, 2, 2293783, 589825, 2, 2228247, 589825, 2, 2162711, 589825, 2, 2097175, 589825, 2, 2031639, 589825, 2, 1966103, 589825, 2, 1900567, 589825, 2, 1835031, 589825, 2, 1769495, 589825, 2, 1703959, 589825, 2, 1638423, 589825, 2, 1572887, 589825, 2, 1507351, 589825, 2, 1441815, 589825, 2, 1376279, 589825, 2, 1310743, 589825, 2, 1245207, 589825, 2, 1179671, 589825, 2, 1114135, 589825, 2, 1048599, 589825, 2, 983063, 589825, 2, 917527, 589825, 2, 851991, 589825, 2, 786455, 589825, 2, 720919, 589825, 2, 655383, 589825, 2, 589847, 589825, 2, 524311, 589825, 2, 458775, 589825, 2, 393239, 589825, 2, 327703, 589825, 2, 262167, 589825, 2, 196631, 589825, 2, 131095, 589825, 2, 65559, 589825, 2, 23, 589825, 2, -65513, 589825, 2, -131049, 589825, 2, -196585, 589825, 2, -262121, 589825, 2, -327657, 589825, 2, -393193, 589825, 2, -458729, 589825, 2, -524265, 589825, 2, -589801, 589825, 2, -655337, 655361, 0, 2949142, 589825, 3, 2883606, 589825, 2, 2818070, 589825, 2, 2752534, 589825, 2, 2686998, 589825, 2, 2621462, 589825, 2, 2555926, 589825, 2, 2490390, 589825, 2, 2424854, 589825, 2, 2359318, 589825, 2, 2293782, 589825, 2, 2228246, 589825, 2, 2162710, 589825, 2, 2097174, 589825, 2, 2031638, 589825, 2, 1966102, 589825, 2, 1900566, 589825, 2, 1835030, 589825, 2, 1769494, 589825, 2, 1703958, 589825, 2, 1638422, 589825, 2, 1572886, 589825, 2, 1507350, 589825, 2, 1441814, 589825, 2, 1376278, 589825, 2, 1310742, 589825, 2, 1245206, 589825, 2, 1179670, 589825, 2, 1114134, 589825, 2, 1048598, 589825, 2, 983062, 589825, 2, 917526, 589825, 2, 851990, 589825, 2, 786454, 589825, 2, 720918, 589825, 2, 655382, 589825, 2, 589846, 589825, 2, 524310, 589825, 2, 458774, 589825, 2, 393238, 589825, 2, 327702, 589825, 2, 262166, 589825, 2, 196630, 589825, 2, 131094, 589825, 2, 65558, 589825, 2, 22, 589825, 2, -65514, 589825, 2, -131050, 589825, 2, -196586, 589825, 2, -262122, 589825, 2, -327658, 589825, 2, -393194, 589825, 2, -458730, 589825, 2, -524266, 589825, 2, -589802, 589825, 2, -655338, 655361, 0, 2949141, 589825, 3, 2883605, 589825, 2, 2818069, 589825, 2, 2752533, 589825, 2, 2686997, 589825, 2, 2621461, 589825, 2, 2555925, 589825, 2, 2490389, 589825, 2, 2424853, 589825, 2, 2359317, 589825, 2, 2293781, 589825, 2, 2228245, 589825, 2, 2162709, 589825, 2, 2097173, 589825, 2, 2031637, 589825, 2, 1966101, 589825, 2, 1900565, 589825, 2, 1835029, 589825, 2, 1769493, 589825, 2, 1703957, 589825, 2, 1638421, 589825, 2, 1572885, 589825, 2, 1507349, 589825, 2, 1441813, 589825, 2, 1376277, 589825, 2, 1310741, 589825, 2, 1245205, 589825, 2, 1179669, 589825, 2, 1114133, 589825, 2, 1048597, 589825, 2, 983061, 589825, 2, 917525, 589825, 2, 851989, 589825, 2, 786453, 589825, 2, 720917, 589825, 2, 655381, 589825, 2, 589845, 589825, 2, 524309, 589825, 2, 458773, 589825, 2, 393237, 589825, 2, 327701, 589825, 2, 262165, 589825, 2, 196629, 589825, 2, 131093, 589825, 2, 65557, 589825, 2, 21, 589825, 2, -65515, 589825, 2, -131051, 589825, 2, -196587, 589825, 2, -262123, 589825, 2, -327659, 589825, 2, -393195, 589825, 2, -458731, 589825, 2, -524267, 589825, 2, -589803, 589825, 2, -655339, 655361, 0, 2949140, 589825, 3, 2883604, 589825, 2, 2818068, 589825, 2, 2752532, 589825, 2, 2686996, 589825, 2, 2621460, 589825, 2, 2555924, 589825, 2, 2490388, 589825, 2, 2424852, 589825, 2, 2359316, 589825, 2, 2293780, 589825, 2, 2228244, 589825, 2, 2162708, 589825, 2, 2097172, 589825, 2, 2031636, 589825, 2, 1966100, 589825, 2, 1900564, 589825, 2, 1835028, 589825, 2, 1769492, 589825, 2, 1703956, 589825, 2, 1638420, 589825, 2, 1572884, 589825, 2, 1507348, 589825, 2, 1441812, 589825, 2, 1376276, 589825, 2, 1310740, 589825, 2, 1245204, 589825, 2, 1179668, 589825, 2, 1114132, 589825, 2, 1048596, 589825, 2, 983060, 589825, 2, 917524, 589825, 2, 851988, 589825, 2, 786452, 589825, 2, 720916, 589825, 2, 655380, 589825, 2, 589844, 589825, 2, 524308, 589825, 2, 458772, 589825, 2, 393236, 589825, 2, 327700, 589825, 2, 262164, 589825, 2, 196628, 589825, 2, 131092, 589825, 2, 65556, 589825, 2, 20, 589825, 2, -65516, 589825, 2, -131052, 589825, 2, -196588, 589825, 2, -262124, 589825, 2, -327660, 589825, 2, -393196, 589825, 2, -458732, 589825, 2, -524268, 589825, 2, -589804, 589825, 2, -655340, 655361, 0, 2949139, 589825, 3, 2883603, 589825, 2, 2818067, 589825, 2, 2752531, 589825, 2, 2686995, 589825, 2, 2621459, 589825, 2, 2555923, 589825, 2, 2490387, 589825, 2, 2424851, 589825, 2, 2359315, 589825, 2, 2293779, 589825, 2, 2228243, 589825, 2, 2162707, 589825, 2, 2097171, 589825, 2, 2031635, 589825, 2, 1966099, 589825, 2, 1900563, 589825, 2, 1835027, 589825, 2, 1769491, 589825, 2, 1703955, 589825, 2, 1638419, 589825, 2, 1572883, 589825, 2, 1507347, 589825, 2, 1441811, 589825, 2, 1376275, 589825, 2, 1310739, 589825, 2, 1245203, 589825, 2, 1179667, 589825, 2, 1114131, 589825, 2, 1048595, 589825, 2, 983059, 589825, 2, 917523, 589825, 2, 851987, 589825, 2, 786451, 589825, 2, 720915, 589825, 2, 655379, 589825, 2, 589843, 589825, 2, 524307, 589825, 2, 458771, 589825, 2, 393235, 589825, 2, 327699, 589825, 2, 262163, 589825, 2, 196627, 589825, 2, 131091, 589825, 2, 65555, 589825, 2, 19, 589825, 2, -65517, 589825, 2, -131053, 589825, 2, -196589, 589825, 2, -262125, 589825, 2, -327661, 589825, 2, -393197, 589825, 2, -458733, 589825, 2, -524269, 589825, 2, -589805, 589825, 2, -655341, 655361, 0, 2949138, 589825, 3, 2883602, 589825, 2, 2818066, 589825, 2, 2752530, 589825, 2, 2686994, 589825, 2, 2621458, 589825, 2, 2555922, 589825, 2, 2490386, 589825, 2, 2424850, 589825, 2, 2359314, 589825, 2, 2293778, 589825, 2, 2228242, 589825, 2, 2162706, 589825, 2, 2097170, 589825, 2, 2031634, 589825, 2, 1966098, 589825, 2, 1900562, 589825, 2, 1835026, 589825, 2, 1769490, 589825, 2, 1703954, 589825, 2, 1638418, 589825, 2, 1572882, 589825, 2, 1507346, 589825, 2, 1441810, 589825, 2, 1376274, 589825, 2, 1310738, 589825, 2, 1245202, 589825, 2, 1179666, 589825, 2, 1114130, 589825, 2, 1048594, 589825, 2, 983058, 589825, 2, 917522, 589825, 2, 851986, 589825, 2, 786450, 589825, 2, 720914, 589825, 2, 655378, 589825, 2, 589842, 589825, 2, 524306, 589825, 2, 458770, 589825, 2, 393234, 589825, 2, 327698, 589825, 2, 262162, 589825, 2, 196626, 589825, 2, 131090, 589825, 2, 65554, 589825, 2, 18, 589825, 2, -65518, 589825, 2, -131054, 589825, 2, -196590, 589825, 2, -262126, 589825, 2, -327662, 589825, 2, -393198, 589825, 2, -458734, 589825, 2, -524270, 589825, 2, -589806, 589825, 2, -655342, 655361, 0, 2949137, 589825, 3, 2883601, 589825, 2, 2818065, 589825, 2, 2752529, 589825, 2, 2686993, 589825, 2, 2621457, 589825, 2, 2555921, 589825, 2, 2490385, 589825, 2, 2424849, 589825, 2, 2359313, 589825, 2, 2293777, 589825, 2, 2228241, 589825, 2, 2162705, 589825, 2, 2097169, 589825, 2, 2031633, 589825, 2, 1966097, 589825, 2, 1900561, 589825, 2, 1835025, 589825, 2, 1769489, 589825, 2, 1703953, 589825, 2, 1638417, 589825, 2, 1572881, 589825, 2, 1507345, 589825, 2, 1441809, 589825, 2, 1376273, 589825, 2, 1310737, 589825, 2, 1245201, 589825, 2, 1179665, 589825, 2, 1114129, 589825, 2, 1048593, 589825, 2, 983057, 589825, 2, 917521, 589825, 2, 851985, 589825, 2, 786449, 589825, 2, 720913, 589825, 2, 655377, 589825, 2, 589841, 589825, 2, 524305, 589825, 2, 458769, 589825, 2, 393233, 589825, 2, 327697, 589825, 2, 262161, 589825, 2, 196625, 589825, 2, 131089, 589825, 2, 65553, 589825, 2, 17, 589825, 2, -65519, 589825, 2, -131055, 589825, 2, -196591, 589825, 2, -262127, 589825, 2, -327663, 589825, 2, -393199, 589825, 2, -458735, 589825, 2, -524271, 589825, 2, -589807, 589825, 2, -655343, 655361, 0, 2949136, 589825, 3, 2883600, 589825, 2, 2818064, 589825, 2, 2752528, 589825, 2, 2686992, 589825, 2, 2621456, 589825, 2, 2555920, 589825, 2, 2490384, 589825, 2, 2424848, 589825, 2, 2359312, 589825, 2, 2293776, 589825, 2, 2228240, 589825, 2, 2162704, 589825, 2, 2097168, 589825, 2, 2031632, 589825, 2, 1966096, 589825, 2, 1900560, 589825, 2, 1835024, 589825, 2, 1769488, 589825, 2, 1703952, 589825, 2, 1638416, 589825, 2, 1572880, 589825, 2, 1507344, 589825, 2, 1441808, 589825, 2, 1376272, 589825, 2, 1310736, 589825, 2, 1245200, 589825, 2, 1179664, 589825, 2, 1114128, 589825, 2, 1048592, 589825, 2, 983056, 589825, 2, 917520, 589825, 2, 851984, 589825, 2, 786448, 589825, 2, 720912, 589825, 2, 655376, 589825, 2, 589840, 589825, 2, 524304, 589825, 2, 458768, 589825, 2, 393232, 589825, 2, 327696, 589825, 2, 262160, 589825, 2, 196624, 589825, 2, 131088, 589825, 2, 65552, 589825, 2, 16, 589825, 2, -65520, 589825, 2, -131056, 589825, 2, -196592, 589825, 2, -262128, 589825, 2, -327664, 589825, 2, -393200, 589825, 2, -458736, 589825, 2, -524272, 589825, 2, -589808, 589825, 2, -655344, 655361, 0, 2949135, 589825, 3, 2883599, 589825, 2, 2818063, 589825, 2, 2752527, 589825, 2, 2686991, 589825, 2, 2621455, 589825, 2, 2555919, 589825, 2, 2490383, 589825, 2, 2424847, 589825, 2, 2359311, 589825, 2, 2293775, 589825, 2, 2228239, 589825, 2, 2162703, 589825, 2, 2097167, 589825, 2, 2031631, 589825, 2, 1966095, 589825, 2, 1900559, 589825, 2, 1835023, 589825, 2, 1769487, 589825, 2, 1703951, 589825, 2, 1638415, 589825, 2, 1572879, 589825, 2, 1507343, 589825, 2, 1441807, 589825, 2, 1376271, 589825, 2, 1310735, 589825, 2, 1245199, 589825, 2, 1179663, 589825, 2, 1114127, 589825, 2, 1048591, 589825, 2, 983055, 589825, 2, 917519, 589825, 2, 851983, 589825, 2, 786447, 589825, 2, 720911, 589825, 2, 655375, 589825, 2, 589839, 589825, 2, 524303, 589825, 2, 458767, 589825, 2, 393231, 589825, 2, 327695, 589825, 2, 262159, 589825, 2, 196623, 589825, 2, 131087, 589825, 2, 65551, 589825, 2, 15, 589825, 2, -65521, 589825, 2, -131057, 589825, 2, -196593, 589825, 2, -262129, 589825, 2, -327665, 589825, 2, -393201, 589825, 2, -458737, 589825, 2, -524273, 589825, 2, -589809, 589825, 2, -655345, 655361, 0, 2949134, 589825, 3, 2883598, 589825, 2, 2818062, 589825, 2, 2752526, 589825, 2, 2686990, 589825, 2, 2621454, 589825, 2, 2555918, 589825, 2, 2490382, 589825, 2, 2424846, 589825, 2, 2359310, 589825, 2, 2293774, 589825, 2, 2228238, 589825, 2, 2162702, 589825, 2, 2097166, 589825, 2, 2031630, 589825, 2, 1966094, 589825, 2, 1900558, 589825, 2, 1835022, 589825, 2, 1769486, 589825, 2, 1703950, 589825, 2, 1638414, 589825, 2, 1572878, 589825, 2, 1507342, 589825, 2, 1441806, 589825, 2, 1376270, 589825, 2, 1310734, 589825, 2, 1245198, 589825, 2, 1179662, 589825, 2, 1114126, 589825, 2, 1048590, 589825, 2, 983054, 589825, 2, 917518, 589825, 2, 851982, 589825, 2, 786446, 589825, 2, 720910, 589825, 2, 655374, 589825, 2, 589838, 589825, 2, 524302, 589825, 2, 458766, 589825, 2, 393230, 589825, 2, 327694, 589825, 2, 262158, 589825, 2, 196622, 589825, 2, 131086, 589825, 2, 65550, 589825, 2, 14, 589825, 2, -65522, 589825, 2, -131058, 589825, 2, -196594, 589825, 2, -262130, 589825, 2, -327666, 589825, 2, -393202, 589825, 2, -458738, 589825, 2, -524274, 589825, 2, -589810, 589825, 2, -655346, 655361, 0, 2949133, 589825, 3, 2883597, 589825, 2, 2818061, 589825, 2, 2752525, 589825, 2, 2686989, 589825, 2, 2621453, 589825, 2, 2555917, 589825, 2, 2490381, 589825, 2, 2424845, 589825, 2, 2359309, 589825, 2, 2293773, 589825, 2, 2228237, 589825, 2, 2162701, 589825, 2, 2097165, 589825, 2, 2031629, 589825, 2, 1966093, 589825, 2, 1900557, 589825, 2, 1835021, 589825, 2, 1769485, 589825, 2, 1703949, 589825, 2, 1638413, 589825, 2, 1572877, 589825, 2, 1507341, 589825, 2, 1441805, 589825, 2, 1376269, 589825, 2, 1310733, 589825, 2, 1245197, 589825, 2, 1179661, 589825, 2, 1114125, 589825, 2, 1048589, 589825, 2, 983053, 589825, 2, 917517, 589825, 2, 851981, 589825, 2, 786445, 589825, 2, 720909, 589825, 2, 655373, 589825, 2, 589837, 589825, 2, 524301, 589825, 2, 458765, 589825, 2, 393229, 589825, 2, 327693, 589825, 2, 262157, 589825, 2, 196621, 589825, 2, 131085, 589825, 2, 65549, 589825, 2, 13, 589825, 2, -65523, 589825, 2, -131059, 589825, 2, -196595, 589825, 2, -262131, 589825, 2, -327667, 589825, 2, -393203, 589825, 2, -458739, 589825, 2, -524275, 589825, 2, -589811, 589825, 2, -655347, 655361, 0, 2949132, 589825, 3, 2883596, 589825, 2, 2818060, 589825, 2, 2752524, 589825, 2, 2686988, 589825, 2, 2621452, 589825, 2, 2555916, 589825, 2, 2490380, 589825, 2, 2424844, 589825, 2, 2359308, 589825, 2, 2293772, 589825, 2, 2228236, 589825, 2, 2162700, 589825, 2, 2097164, 589825, 2, 2031628, 589825, 2, 1966092, 589825, 2, 1900556, 589825, 2, 1835020, 589825, 2, 1769484, 589825, 2, 1703948, 589825, 2, 1638412, 589825, 2, 1572876, 589825, 2, 1507340, 589825, 2, 1441804, 589825, 2, 1376268, 589825, 2, 1310732, 589825, 2, 1245196, 589825, 2, 1179660, 589825, 2, 1114124, 589825, 2, 1048588, 589825, 2, 983052, 589825, 2, 917516, 589825, 2, 851980, 589825, 2, 786444, 589825, 2, 720908, 589825, 2, 655372, 589825, 2, 589836, 589825, 2, 524300, 589825, 2, 458764, 589825, 2, 393228, 589825, 2, 327692, 589825, 2, 262156, 589825, 2, 196620, 589825, 2, 131084, 589825, 2, 65548, 589825, 2, 12, 589825, 2, -65524, 589825, 2, -131060, 589825, 2, -196596, 589825, 2, -262132, 589825, 2, -327668, 589825, 2, -393204, 589825, 2, -458740, 589825, 2, -524276, 589825, 2, -589812, 589825, 2, -655348, 655361, 0, 2949131, 589825, 3, 2883595, 589825, 2, 2818059, 589825, 2, 2752523, 589825, 2, 2686987, 589825, 2, 2621451, 589825, 2, 2555915, 589825, 2, 2490379, 589825, 2, 2424843, 589825, 2, 2359307, 589825, 2, 2293771, 589825, 2, 2228235, 589825, 2, 2162699, 589825, 2, 2097163, 589825, 2, 2031627, 589825, 2, 1966091, 589825, 2, 1900555, 589825, 2, 1835019, 589825, 2, 1769483, 589825, 2, 1703947, 589825, 2, 1638411, 589825, 2, 1572875, 589825, 2, 1507339, 589825, 2, 1441803, 589825, 2, 1376267, 589825, 2, 1310731, 589825, 2, 1245195, 589825, 2, 1179659, 589825, 2, 1114123, 589825, 2, 1048587, 589825, 2, 983051, 589825, 2, 917515, 589825, 2, 851979, 589825, 2, 786443, 589825, 2, 720907, 589825, 2, 655371, 589825, 2, 589835, 589825, 2, 524299, 589825, 2, 458763, 589825, 2, 393227, 589825, 2, 327691, 589825, 2, 262155, 589825, 2, 196619, 589825, 2, 131083, 589825, 2, 65547, 589825, 2, 11, 589825, 2, -65525, 589825, 2, -131061, 589825, 2, -196597, 589825, 2, -262133, 589825, 2, -327669, 589825, 2, -393205, 589825, 2, -458741, 589825, 2, -524277, 589825, 2, -589813, 589825, 2, -655349, 655361, 0, 2949130, 589825, 3, 2883594, 589825, 2, 2818058, 589825, 2, 2752522, 589825, 2, 2686986, 589825, 2, 2621450, 589825, 2, 2555914, 589825, 2, 2490378, 589825, 2, 2424842, 589825, 2, 2359306, 589825, 2, 2293770, 589825, 2, 2228234, 589825, 2, 2162698, 589825, 2, 2097162, 589825, 2, 2031626, 589825, 2, 1966090, 589825, 2, 1900554, 589825, 2, 1835018, 589825, 2, 1769482, 589825, 2, 1703946, 589825, 2, 1638410, 589825, 2, 1572874, 589825, 2, 1507338, 589825, 2, 1441802, 589825, 2, 1376266, 589825, 2, 1310730, 589825, 2, 1245194, 589825, 2, 1179658, 589825, 2, 1114122, 589825, 2, 1048586, 589825, 2, 983050, 589825, 2, 917514, 589825, 2, 851978, 589825, 2, 786442, 589825, 2, 720906, 589825, 2, 655370, 589825, 2, 589834, 589825, 2, 524298, 589825, 2, 458762, 589825, 2, 393226, 589825, 2, 327690, 589825, 2, 262154, 589825, 2, 196618, 589825, 2, 131082, 589825, 2, 65546, 589825, 2, 10, 589825, 2, -65526, 589825, 2, -131062, 589825, 2, -196598, 589825, 2, -262134, 589825, 2, -327670, 589825, 2, -393206, 589825, 2, -458742, 589825, 2, -524278, 589825, 2, -589814, 589825, 2, -655350, 655361, 0, 2949129, 589825, 3, 2883593, 589825, 2, 2818057, 589825, 2, 2752521, 589825, 2, 2686985, 589825, 2, 2621449, 589825, 2, 2555913, 589825, 2, 2490377, 589825, 2, 2424841, 589825, 2, 2359305, 589825, 2, 2293769, 589825, 2, 2228233, 589825, 2, 2162697, 589825, 2, 2097161, 589825, 2, 2031625, 589825, 2, 1966089, 589825, 2, 1900553, 589825, 2, 1835017, 589825, 2, 1769481, 589825, 2, 1703945, 589825, 2, 1638409, 589825, 2, 1572873, 589825, 2, 1507337, 589825, 2, 1441801, 589825, 2, 1376265, 589825, 2, 1310729, 589825, 2, 1245193, 589825, 2, 1179657, 589825, 2, 1114121, 589825, 2, 1048585, 589825, 2, 983049, 589825, 2, 917513, 589825, 2, 851977, 589825, 2, 786441, 589825, 2, 720905, 589825, 2, 655369, 589825, 2, 589833, 589825, 2, 524297, 589825, 2, 458761, 589825, 2, 393225, 589825, 2, 327689, 589825, 2, 262153, 589825, 2, 196617, 589825, 2, 131081, 589825, 2, 65545, 589825, 2, 9, 589825, 2, -65527, 589825, 2, -131063, 589825, 2, -196599, 589825, 2, -262135, 589825, 2, -327671, 589825, 2, -393207, 589825, 2, -458743, 589825, 2, -524279, 589825, 2, -589815, 589825, 2, -655351, 655361, 0, 2949128, 589825, 3, 2883592, 589825, 2, 2818056, 589825, 2, 2752520, 589825, 2, 2686984, 589825, 2, 2621448, 589825, 2, 2555912, 589825, 2, 2490376, 589825, 2, 2424840, 589825, 2, 2359304, 589825, 2, 2293768, 589825, 2, 2228232, 589825, 2, 2162696, 589825, 2, 2097160, 589825, 2, 2031624, 589825, 2, 1966088, 589825, 2, 1900552, 589825, 2, 1835016, 589825, 2, 1769480, 589825, 2, 1703944, 589825, 2, 1638408, 589825, 2, 1572872, 589825, 2, 1507336, 589825, 2, 1441800, 589825, 2, 1376264, 589825, 2, 1310728, 589825, 2, 1245192, 589825, 2, 1179656, 589825, 2, 1114120, 589825, 2, 1048584, 589825, 2, 983048, 589825, 2, 917512, 589825, 2, 851976, 589825, 2, 786440, 589825, 2, 720904, 589825, 2, 655368, 589825, 2, 589832, 589825, 2, 524296, 589825, 2, 458760, 589825, 2, 393224, 589825, 2, 327688, 589825, 2, 262152, 589825, 2, 196616, 589825, 2, 131080, 589825, 2, 65544, 589825, 2, 8, 589825, 2, -65528, 589825, 2, -131064, 589825, 2, -196600, 589825, 2, -262136, 589825, 2, -327672, 589825, 2, -393208, 589825, 2, -458744, 589825, 2, -524280, 589825, 2, -589816, 589825, 2, -655352, 655361, 0, 2949127, 589825, 3, 2883591, 589825, 2, 2818055, 589825, 2, 2752519, 589825, 2, 2686983, 589825, 2, 2621447, 589825, 2, 2555911, 589825, 2, 2490375, 589825, 2, 2424839, 589825, 2, 2359303, 589825, 2, 2293767, 589825, 2, 2228231, 589825, 2, 2162695, 589825, 2, 2097159, 589825, 2, 2031623, 589825, 2, 1966087, 589825, 2, 1900551, 589825, 2, 1835015, 589825, 2, 1769479, 589825, 2, 1703943, 589825, 2, 1638407, 589825, 2, 1572871, 589825, 2, 1507335, 589825, 2, 1441799, 589825, 2, 1376263, 589825, 2, 1310727, 589825, 2, 1245191, 589825, 2, 1179655, 589825, 2, 1114119, 589825, 2, 1048583, 589825, 2, 983047, 589825, 2, 917511, 589825, 2, 851975, 589825, 2, 786439, 589825, 2, 720903, 589825, 2, 655367, 589825, 2, 589831, 589825, 2, 524295, 589825, 2, 458759, 589825, 2, 393223, 589825, 2, 327687, 589825, 2, 262151, 589825, 2, 196615, 589825, 2, 131079, 589825, 2, 65543, 589825, 2, 7, 589825, 2, -65529, 589825, 2, -131065, 589825, 2, -196601, 589825, 2, -262137, 589825, 2, -327673, 589825, 2, -393209, 589825, 2, -458745, 589825, 2, -524281, 589825, 2, -589817, 589825, 2, -655353, 655361, 0, 2949126, 589825, 3, 2883590, 589825, 2, 2818054, 589825, 2, 2752518, 589825, 2, 2686982, 589825, 2, 2621446, 589825, 2, 2555910, 589825, 2, 2490374, 589825, 2, 2424838, 589825, 2, 2359302, 589825, 2, 2293766, 589825, 2, 2228230, 589825, 2, 2162694, 589825, 2, 2097158, 589825, 2, 2031622, 589825, 2, 1966086, 589825, 2, 1900550, 589825, 2, 1835014, 589825, 2, 1769478, 589825, 2, 1703942, 589825, 2, 1638406, 589825, 2, 1572870, 589825, 2, 1507334, 589825, 2, 1441798, 589825, 2, 1376262, 589825, 2, 1310726, 589825, 2, 1245190, 589825, 2, 1179654, 589825, 2, 1114118, 589825, 2, 1048582, 589825, 2, 983046, 589825, 2, 917510, 589825, 2, 851974, 589825, 2, 786438, 589825, 2, 720902, 589825, 2, 655366, 589825, 2, 589830, 589825, 2, 524294, 589825, 2, 458758, 589825, 2, 393222, 589825, 2, 327686, 589825, 2, 262150, 589825, 2, 196614, 589825, 2, 131078, 589825, 2, 65542, 589825, 2, 6, 589825, 2, -65530, 589825, 2, -131066, 589825, 2, -196602, 589825, 2, -262138, 589825, 2, -327674, 589825, 2, -393210, 589825, 2, -458746, 589825, 2, -524282, 589825, 2, -589818, 589825, 2, -655354, 655361, 0, 2949125, 589825, 3, 2883589, 589825, 2, 2818053, 589825, 2, 2752517, 589825, 2, 2686981, 589825, 2, 2621445, 589825, 2, 2555909, 589825, 2, 2490373, 589825, 2, 2424837, 589825, 2, 2359301, 589825, 2, 2293765, 589825, 2, 2228229, 589825, 2, 2162693, 589825, 2, 2097157, 589825, 2, 2031621, 589825, 2, 1966085, 589825, 2, 1900549, 589825, 2, 1835013, 589825, 2, 1769477, 589825, 2, 1703941, 589825, 2, 1638405, 589825, 2, 1572869, 589825, 2, 1507333, 589825, 2, 1441797, 589825, 2, 1376261, 589825, 2, 1310725, 589825, 2, 1245189, 589825, 2, 1179653, 589825, 2, 1114117, 589825, 2, 1048581, 589825, 2, 983045, 589825, 2, 917509, 589825, 2, 851973, 589825, 2, 786437, 589825, 2, 720901, 589825, 2, 655365, 589825, 2, 589829, 589825, 2, 524293, 589825, 2, 458757, 589825, 2, 393221, 589825, 2, 327685, 589825, 2, 262149, 589825, 2, 196613, 589825, 2, 131077, 589825, 2, 65541, 589825, 2, 5, 589825, 2, -65531, 589825, 2, -131067, 589825, 2, -196603, 589825, 2, -262139, 589825, 2, -327675, 589825, 2, -393211, 589825, 2, -458747, 589825, 2, -524283, 589825, 2, -589819, 589825, 2, -655355, 655361, 0, 2949124, 589825, 3, 2883588, 589825, 2, 2818052, 589825, 2, 2752516, 589825, 2, 2686980, 589825, 2, 2621444, 589825, 2, 2555908, 589825, 2, 2490372, 589825, 2, 2424836, 589825, 2, 2359300, 589825, 2, 2293764, 589825, 2, 2228228, 589825, 2, 2162692, 589825, 2, 2097156, 589825, 2, 2031620, 589825, 2, 1966084, 589825, 2, 1900548, 589825, 2, 1835012, 589825, 2, 1769476, 589825, 2, 1703940, 589825, 2, 1638404, 589825, 2, 1572868, 589825, 2, 1507332, 589825, 2, 1441796, 589825, 2, 1376260, 589825, 2, 1310724, 589825, 2, 1245188, 589825, 2, 1179652, 589825, 2, 1114116, 589825, 2, 1048580, 589825, 2, 983044, 589825, 2, 917508, 589825, 2, 851972, 589825, 2, 786436, 589825, 2, 720900, 589825, 2, 655364, 589825, 2, 589828, 589825, 2, 524292, 589825, 2, 458756, 589825, 2, 393220, 589825, 2, 327684, 589825, 2, 262148, 589825, 2, 196612, 589825, 2, 131076, 589825, 2, 65540, 589825, 2, 4, 589825, 2, -65532, 589825, 2, -131068, 589825, 2, -196604, 589825, 2, -262140, 589825, 2, -327676, 589825, 2, -393212, 589825, 2, -458748, 589825, 2, -524284, 589825, 2, -589820, 589825, 2, -655356, 655361, 0, 2949123, 589825, 3, 2883587, 589825, 2, 2818051, 589825, 2, 2752515, 589825, 2, 2686979, 589825, 2, 2621443, 589825, 2, 2555907, 589825, 2, 2490371, 589825, 2, 2424835, 589825, 2, 2359299, 589825, 2, 2293763, 589825, 2, 2228227, 589825, 2, 2162691, 589825, 2, 2097155, 589825, 2, 2031619, 589825, 2, 1966083, 589825, 2, 1900547, 589825, 2, 1835011, 589825, 2, 1769475, 589825, 2, 1703939, 589825, 2, 1638403, 589825, 2, 1572867, 589825, 2, 1507331, 589825, 2, 1441795, 589825, 2, 1376259, 589825, 2, 1310723, 589825, 2, 1245187, 589825, 2, 1179651, 589825, 2, 1114115, 589825, 2, 1048579, 589825, 2, 983043, 589825, 2, 917507, 589825, 2, 851971, 589825, 2, 786435, 589825, 2, 720899, 589825, 2, 655363, 589825, 2, 589827, 589825, 2, 524291, 589825, 2, 458755, 589825, 2, 393219, 589825, 2, 327683, 589825, 2, 262147, 589825, 2, 196611, 589825, 2, 131075, 589825, 2, 65539, 589825, 2, 3, 589825, 2, -65533, 589825, 2, -131069, 589825, 2, -196605, 589825, 2, -262141, 589825, 2, -327677, 589825, 2, -393213, 589825, 2, -458749, 589825, 2, -524285, 589825, 2, -589821, 589825, 2, -655357, 655361, 0, 2949122, 589825, 3, 2883586, 589825, 2, 2818050, 589825, 2, 2752514, 589825, 2, 2686978, 589825, 2, 2621442, 589825, 2, 2555906, 589825, 2, 2490370, 589825, 2, 2424834, 589825, 2, 2359298, 589825, 2, 2293762, 589825, 2, 2228226, 589825, 2, 2162690, 589825, 2, 2097154, 589825, 2, 2031618, 589825, 2, 1966082, 589825, 2, 1900546, 589825, 2, 1835010, 589825, 2, 1769474, 589825, 2, 1703938, 589825, 2, 1638402, 589825, 2, 1572866, 589825, 2, 1507330, 589825, 2, 1441794, 589825, 2, 1376258, 589825, 2, 1310722, 589825, 2, 1245186, 589825, 2, 1179650, 589825, 2, 1114114, 589825, 2, 1048578, 589825, 2, 983042, 589825, 2, 917506, 589825, 2, 851970, 589825, 2, 786434, 589825, 2, 720898, 589825, 2, 655362, 589825, 2, 589826, 589825, 2, 524290, 589825, 2, 458754, 589825, 2, 393218, 589825, 2, 327682, 589825, 2, 262146, 589825, 2, 196610, 589825, 2, 131074, 589825, 2, 65538, 589825, 2, 2, 589825, 2, -65534, 589825, 2, -131070, 589825, 2, -196606, 589825, 2, -262142, 589825, 2, -327678, 589825, 2, -393214, 589825, 2, -458750, 589825, 2, -524286, 589825, 2, -589822, 589825, 2, -655358, 655361, 0, 2949121, 589825, 3, 2883585, 589825, 2, 2818049, 589825, 2, 2752513, 589825, 2, 2686977, 589825, 2, 2621441, 589825, 2, 2555905, 589825, 2, 2490369, 589825, 2, 2424833, 589825, 2, 2359297, 589825, 2, 2293761, 589825, 2, 2228225, 589825, 2, 2162689, 589825, 2, 2097153, 589825, 2, 2031617, 589825, 2, 1966081, 589825, 2, 1900545, 589825, 2, 1835009, 589825, 2, 1769473, 589825, 2, 1703937, 589825, 2, 1638401, 589825, 2, 1572865, 589825, 2, 1507329, 589825, 2, 1441793, 589825, 2, 1376257, 589825, 2, 1310721, 589825, 2, 1245185, 589825, 2, 1179649, 589825, 2, 1114113, 589825, 2, 1048577, 589825, 2, 983041, 589825, 2, 917505, 589825, 2, 851969, 589825, 2, 786433, 589825, 2, 720897, 589825, 2, 655361, 589825, 2, 589825, 589825, 2, 524289, 589825, 2, 458753, 589825, 2, 393217, 589825, 2, 327681, 589825, 2, 262145, 589825, 2, 196609, 589825, 2, 131073, 589825, 2, 65537, 589825, 2, 1, 589825, 2, -65535, 589825, 2, -131071, 589825, 2, -196607, 589825, 2, -262143, 589825, 2, -327679, 589825, 2, -393215, 589825, 2, -458751, 589825, 2, -524287, 589825, 2, -589823, 589825, 2, -655359, 655361, 0, 2949120, 589825, 3, 2883584, 589825, 2, 2818048, 589825, 2, 2752512, 589825, 2, 2686976, 589825, 2, 2621440, 589825, 2, 2555904, 589825, 2, 2490368, 589825, 2, 2424832, 589825, 2, 2359296, 589825, 2, 2293760, 589825, 2, 2228224, 589825, 2, 2162688, 589825, 2, 2097152, 589825, 2, 2031616, 589825, 2, 1966080, 589825, 2, 1900544, 589825, 2, 1835008, 589825, 2, 1769472, 589825, 2, 1703936, 589825, 2, 1638400, 589825, 2, 1572864, 589825, 2, 1507328, 589825, 2, 1441792, 589825, 2, 1376256, 589825, 2, 1310720, 589825, 2, 1245184, 589825, 2, 1179648, 589825, 2, 1114112, 589825, 2, 1048576, 589825, 2, 983040, 589825, 2, 917504, 589825, 2, 851968, 589825, 2, 786432, 589825, 2, 720896, 589825, 2, 655360, 589825, 2, 589824, 589825, 2, 524288, 589825, 2, 458752, 589825, 2, 393216, 589825, 2, 327680, 589825, 2, 262144, 589825, 2, 196608, 589825, 2, 131072, 589825, 2, 65536, 589825, 2, 0, 589825, 2, -65536, 589825, 2, -131072, 589825, 2, -196608, 589825, 2, -262144, 589825, 2, -327680, 589825, 2, -393216, 589825, 2, -458752, 589825, 2, -524288, 589825, 2, -589824, 589825, 2, -655360, 655361, 0, 3014655, 589825, 3, 2949119, 589825, 2, 2883583, 589825, 2, 2818047, 589825, 2, 2752511, 589825, 2, 2686975, 589825, 2, 2621439, 589825, 2, 2555903, 589825, 2, 2490367, 589825, 2, 2424831, 589825, 2, 2359295, 589825, 2, 2293759, 589825, 2, 2228223, 589825, 2, 2162687, 589825, 2, 2097151, 589825, 2, 2031615, 589825, 2, 1966079, 589825, 2, 1900543, 589825, 2, 1835007, 589825, 2, 1769471, 589825, 2, 1703935, 589825, 2, 1638399, 589825, 2, 1572863, 589825, 2, 1507327, 589825, 2, 1441791, 589825, 2, 1376255, 589825, 2, 1310719, 589825, 2, 1245183, 589825, 2, 1179647, 589825, 2, 1114111, 589825, 2, 1048575, 589825, 2, 983039, 589825, 2, 917503, 589825, 2, 851967, 589825, 2, 786431, 589825, 2, 720895, 589825, 2, 655359, 589825, 2, 589823, 589825, 2, 524287, 589825, 2, 458751, 589825, 2, 393215, 589825, 2, 327679, 589825, 2, 262143, 589825, 2, 196607, 589825, 2, 131071, 589825, 2, 65535, 589825, 2, -1, 589825, 2, -65537, 589825, 2, -131073, 589825, 2, -196609, 589825, 2, -262145, 589825, 2, -327681, 589825, 2, -393217, 589825, 2, -458753, 589825, 2, -524289, 589825, 2, -589825, 655361, 0, 3014654, 589825, 3, 2949118, 589825, 2, 2883582, 589825, 2, 2818046, 589825, 2, 2752510, 589825, 2, 2686974, 589825, 2, 2621438, 589825, 2, 2555902, 589825, 2, 2490366, 589825, 2, 2424830, 589825, 2, 2359294, 589825, 2, 2293758, 589825, 2, 2228222, 589825, 2, 2162686, 589825, 2, 2097150, 589825, 2, 2031614, 589825, 2, 1966078, 589825, 2, 1900542, 589825, 2, 1835006, 589825, 2, 1769470, 589825, 2, 1703934, 589825, 2, 1638398, 589825, 2, 1572862, 589825, 2, 1507326, 589825, 2, 1441790, 589825, 2, 1376254, 589825, 2, 1310718, 589825, 2, 1245182, 589825, 2, 1179646, 589825, 2, 1114110, 589825, 2, 1048574, 589825, 2, 983038, 589825, 2, 917502, 589825, 2, 851966, 589825, 2, 786430, 589825, 2, 720894, 589825, 2, 655358, 589825, 2, 589822, 589825, 2, 524286, 589825, 2, 458750, 589825, 2, 393214, 589825, 2, 327678, 589825, 2, 262142, 589825, 2, 196606, 589825, 2, 131070, 589825, 2, 65534, 589825, 2, -2, 589825, 2, -65538, 589825, 2, -131074, 589825, 2, -196610, 589825, 2, -262146, 589825, 2, -327682, 589825, 2, -393218, 589825, 2, -458754, 589825, 2, -524290, 589825, 2, -589826, 655361, 0, 3014653, 589825, 3, 2949117, 589825, 2, 2883581, 589825, 2, 2818045, 589825, 2, 2752509, 589825, 2, 2686973, 589825, 2, 2621437, 589825, 2, 2555901, 589825, 2, 2490365, 589825, 2, 2424829, 589825, 2, 2359293, 589825, 2, 2293757, 589825, 2, 2228221, 589825, 2, 2162685, 589825, 2, 2097149, 589825, 2, 2031613, 589825, 2, 1966077, 589825, 2, 1900541, 589825, 2, 1835005, 589825, 2, 1769469, 589825, 2, 1703933, 589825, 2, 1638397, 589825, 2, 1572861, 589825, 2, 1507325, 589825, 2, 1441789, 589825, 2, 1376253, 589825, 2, 1310717, 589825, 2, 1245181, 589825, 2, 1179645, 589825, 2, 1114109, 589825, 2, 1048573, 589825, 2, 983037, 589825, 2, 917501, 589825, 2, 851965, 589825, 2, 786429, 589825, 2, 720893, 589825, 2, 655357, 589825, 2, 589821, 589825, 2, 524285, 589825, 2, 458749, 589825, 2, 393213, 589825, 2, 327677, 589825, 2, 262141, 589825, 2, 196605, 589825, 2, 131069, 589825, 2, 65533, 589825, 2, -3, 589825, 2, -65539, 589825, 2, -131075, 589825, 2, -196611, 589825, 2, -262147, 589825, 2, -327683, 589825, 2, -393219, 589825, 2, -458755, 589825, 2, -524291, 589825, 2, -589827, 655361, 0, 3014652, 589825, 3, 2949116, 589825, 2, 2883580, 589825, 2, 2818044, 589825, 2, 2752508, 589825, 2, 2686972, 589825, 2, 2621436, 589825, 2, 2555900, 589825, 2, 2490364, 589825, 2, 2424828, 589825, 2, 2359292, 589825, 2, 2293756, 589825, 2, 2228220, 589825, 2, 2162684, 589825, 2, 2097148, 589825, 2, 2031612, 589825, 2, 1966076, 589825, 2, 1900540, 589825, 2, 1835004, 589825, 2, 1769468, 589825, 2, 1703932, 589825, 2, 1638396, 589825, 2, 1572860, 589825, 2, 1507324, 589825, 2, 1441788, 589825, 2, 1376252, 589825, 2, 1310716, 589825, 2, 1245180, 589825, 2, 1179644, 589825, 2, 1114108, 589825, 2, 1048572, 589825, 2, 983036, 589825, 2, 917500, 589825, 2, 851964, 589825, 2, 786428, 589825, 2, 720892, 589825, 2, 655356, 589825, 2, 589820, 589825, 2, 524284, 589825, 2, 458748, 589825, 2, 393212, 589825, 2, 327676, 589825, 2, 262140, 589825, 2, 196604, 589825, 2, 131068, 589825, 2, 65532, 589825, 2, -4, 589825, 2, -65540, 589825, 2, -131076, 589825, 2, -196612, 589825, 2, -262148, 589825, 2, -327684, 589825, 2, -393220, 589825, 2, -458756, 589825, 2, -524292, 589825, 2, -589828, 655361, 0, 3014651, 589825, 3, 2949115, 589825, 2, 2883579, 589825, 2, 2818043, 589825, 2, 2752507, 589825, 2, 2686971, 589825, 2, 2621435, 589825, 2, 2555899, 589825, 2, 2490363, 589825, 2, 2424827, 589825, 2, 2359291, 589825, 2, 2293755, 589825, 2, 2228219, 589825, 2, 2162683, 589825, 2, 2097147, 589825, 2, 2031611, 589825, 2, 1966075, 589825, 2, 1900539, 589825, 2, 1835003, 589825, 2, 1769467, 589825, 2, 1703931, 589825, 2, 1638395, 589825, 2, 1572859, 589825, 2, 1507323, 589825, 2, 1441787, 589825, 2, 1376251, 589825, 2, 1310715, 589825, 2, 1245179, 589825, 2, 1179643, 589825, 2, 1114107, 589825, 2, 1048571, 589825, 2, 983035, 589825, 2, 917499, 589825, 2, 851963, 589825, 2, 786427, 589825, 2, 720891, 589825, 2, 655355, 589825, 2, 589819, 589825, 2, 524283, 589825, 2, 458747, 589825, 2, 393211, 589825, 2, 327675, 589825, 2, 262139, 589825, 2, 196603, 589825, 2, 131067, 589825, 2, 65531, 589825, 2, -5, 589825, 2, -65541, 589825, 2, -131077, 589825, 2, -196613, 589825, 2, -262149, 589825, 2, -327685, 589825, 2, -393221, 589825, 2, -458757, 589825, 2, -524293, 589825, 2, -589829, 655361, 0, 3014650, 589825, 3, 2949114, 589825, 2, 2883578, 589825, 2, 2818042, 589825, 2, 2752506, 589825, 2, 2686970, 589825, 2, 2621434, 589825, 2, 2555898, 589825, 2, 2490362, 589825, 2, 2424826, 589825, 2, 2359290, 589825, 2, 2293754, 589825, 2, 2228218, 589825, 2, 2162682, 589825, 2, 2097146, 589825, 2, 2031610, 589825, 2, 1966074, 589825, 2, 1900538, 589825, 2, 1835002, 589825, 2, 1769466, 589825, 2, 1703930, 589825, 2, 1638394, 589825, 2, 1572858, 589825, 2, 1507322, 589825, 2, 1441786, 589825, 2, 1376250, 589825, 2, 1310714, 589825, 2, 1245178, 589825, 2, 1179642, 589825, 2, 1114106, 589825, 2, 1048570, 589825, 2, 983034, 589825, 2, 917498, 589825, 2, 851962, 589825, 2, 786426, 589825, 2, 720890, 589825, 2, 655354, 589825, 2, 589818, 589825, 2, 524282, 589825, 2, 458746, 589825, 2, 393210, 589825, 2, 327674, 589825, 2, 262138, 589825, 2, 196602, 589825, 2, 131066, 589825, 2, 65530, 589825, 2, -6, 589825, 2, -65542, 589825, 2, -131078, 589825, 2, -196614, 589825, 2, -262150, 589825, 2, -327686, 589825, 2, -393222, 589825, 2, -458758, 589825, 2, -524294, 589825, 2, -589830, 655361, 0, 3014649, 589825, 3, 2949113, 589825, 2, 2883577, 589825, 2, 2818041, 589825, 2, 2752505, 589825, 2, 2686969, 589825, 2, 2621433, 589825, 2, 2555897, 589825, 2, 2490361, 589825, 2, 2424825, 589825, 2, 2359289, 589825, 2, 2293753, 589825, 2, 2228217, 589825, 2, 2162681, 589825, 2, 2097145, 589825, 2, 2031609, 589825, 2, 1966073, 589825, 2, 1900537, 589825, 2, 1835001, 589825, 2, 1769465, 589825, 2, 1703929, 589825, 2, 1638393, 589825, 2, 1572857, 589825, 2, 1507321, 589825, 2, 1441785, 589825, 2, 1376249, 589825, 2, 1310713, 589825, 2, 1245177, 589825, 2, 1179641, 589825, 2, 1114105, 589825, 2, 1048569, 589825, 2, 983033, 589825, 2, 917497, 589825, 2, 851961, 589825, 2, 786425, 589825, 2, 720889, 589825, 2, 655353, 589825, 2, 589817, 589825, 2, 524281, 589825, 2, 458745, 589825, 2, 393209, 589825, 2, 327673, 589825, 2, 262137, 589825, 2, 196601, 589825, 2, 131065, 589825, 2, 65529, 589825, 2, -7, 589825, 2, -65543, 589825, 2, -131079, 589825, 2, -196615, 589825, 2, -262151, 589825, 2, -327687, 589825, 2, -393223, 589825, 2, -458759, 589825, 2, -524295, 589825, 2, -589831, 655361, 0, 3014648, 589825, 3, 2949112, 589825, 2, 2883576, 589825, 2, 2818040, 589825, 2, 2752504, 589825, 2, 2686968, 589825, 2, 2621432, 589825, 2, 2555896, 589825, 2, 2490360, 589825, 2, 2424824, 589825, 2, 2359288, 589825, 2, 2293752, 589825, 2, 2228216, 589825, 2, 2162680, 589825, 2, 2097144, 589825, 2, 2031608, 589825, 2, 1966072, 589825, 2, 1900536, 589825, 2, 1835000, 589825, 2, 1769464, 589825, 2, 1703928, 589825, 2, 1638392, 589825, 2, 1572856, 589825, 2, 1507320, 589825, 2, 1441784, 589825, 2, 1376248, 589825, 2, 1310712, 589825, 2, 1245176, 589825, 2, 1179640, 589825, 2, 1114104, 589825, 2, 1048568, 589825, 2, 983032, 589825, 2, 917496, 589825, 2, 851960, 589825, 2, 786424, 589825, 2, 720888, 589825, 2, 655352, 589825, 2, 589816, 589825, 2, 524280, 589825, 2, 458744, 589825, 2, 393208, 589825, 2, 327672, 589825, 2, 262136, 589825, 2, 196600, 589825, 2, 131064, 589825, 2, 65528, 589825, 2, -8, 589825, 2, -65544, 589825, 2, -131080, 589825, 2, -196616, 589825, 2, -262152, 589825, 2, -327688, 589825, 2, -393224, 589825, 2, -458760, 589825, 2, -524296, 589825, 2, -589832, 655361, 0, 3014647, 589825, 3, 2949111, 589825, 2, 2883575, 589825, 2, 2818039, 589825, 2, 2752503, 589825, 2, 2686967, 589825, 2, 2621431, 589825, 2, 2555895, 589825, 2, 2490359, 589825, 2, 2424823, 589825, 2, 2359287, 589825, 2, 2293751, 589825, 2, 2228215, 589825, 2, 2162679, 589825, 2, 2097143, 589825, 2, 2031607, 589825, 2, 1966071, 589825, 2, 1900535, 589825, 2, 1834999, 589825, 2, 1769463, 589825, 2, 1703927, 589825, 2, 1638391, 589825, 2, 1572855, 589825, 2, 1507319, 589825, 2, 1441783, 589825, 2, 1376247, 589825, 2, 1310711, 589825, 2, 1245175, 589825, 2, 1179639, 589825, 2, 1114103, 589825, 2, 1048567, 589825, 2, 983031, 589825, 2, 917495, 589825, 2, 851959, 589825, 2, 786423, 589825, 2, 720887, 589825, 2, 655351, 589825, 2, 589815, 589825, 2, 524279, 589825, 2, 458743, 589825, 2, 393207, 589825, 2, 327671, 589825, 2, 262135, 589825, 2, 196599, 589825, 2, 131063, 589825, 2, 65527, 589825, 2, -9, 589825, 2, -65545, 589825, 2, -131081, 589825, 2, -196617, 589825, 2, -262153, 589825, 2, -327689, 589825, 2, -393225, 589825, 2, -458761, 589825, 2, -524297, 589825, 2, -589833, 655361, 0, 3014646, 589825, 3, 2949110, 589825, 2, 2883574, 589825, 2, 2818038, 589825, 2, 2752502, 589825, 2, 2686966, 589825, 2, 2621430, 589825, 2, 2555894, 589825, 2, 2490358, 589825, 2, 2424822, 589825, 2, 2359286, 589825, 2, 2293750, 589825, 2, 2228214, 589825, 2, 2162678, 589825, 2, 2097142, 589825, 2, 2031606, 589825, 2, 1966070, 589825, 2, 1900534, 589825, 2, 1834998, 589825, 2, 1769462, 589825, 2, 1703926, 589825, 2, 1638390, 589825, 2, 1572854, 589825, 2, 1507318, 589825, 2, 1441782, 589825, 2, 1376246, 589825, 2, 1310710, 589825, 2, 1245174, 589825, 2, 1179638, 589825, 2, 1114102, 589825, 2, 1048566, 589825, 2, 983030, 589825, 2, 917494, 589825, 2, 851958, 589825, 2, 786422, 589825, 2, 720886, 589825, 2, 655350, 589825, 2, 589814, 589825, 2, 524278, 589825, 2, 458742, 589825, 2, 393206, 589825, 2, 327670, 589825, 2, 262134, 589825, 2, 196598, 589825, 2, 131062, 589825, 2, 65526, 589825, 2, -10, 589825, 2, -65546, 589825, 2, -131082, 589825, 2, -196618, 589825, 2, -262154, 589825, 2, -327690, 589825, 2, -393226, 589825, 2, -458762, 589825, 2, -524298, 589825, 2, -589834, 655361, 0, 3014645, 589825, 3, 2949109, 589825, 2, 2883573, 589825, 2, 2818037, 589825, 2, 2752501, 589825, 2, 2686965, 589825, 2, 2621429, 589825, 2, 2555893, 589825, 2, 2490357, 589825, 2, 2424821, 589825, 2, 2359285, 589825, 2, 2293749, 589825, 2, 2228213, 589825, 2, 2162677, 589825, 2, 2097141, 589825, 2, 2031605, 589825, 2, 1966069, 589825, 2, 1900533, 589825, 2, 1834997, 589825, 2, 1769461, 589825, 2, 1703925, 589825, 2, 1638389, 589825, 2, 1572853, 589825, 2, 1507317, 589825, 2, 1441781, 589825, 2, 1376245, 589825, 2, 1310709, 589825, 2, 1245173, 589825, 2, 1179637, 589825, 2, 1114101, 589825, 2, 1048565, 589825, 2, 983029, 589825, 2, 917493, 589825, 2, 851957, 589825, 2, 786421, 589825, 2, 720885, 589825, 2, 655349, 589825, 2, 589813, 589825, 2, 524277, 589825, 2, 458741, 589825, 2, 393205, 589825, 2, 327669, 589825, 2, 262133, 589825, 2, 196597, 589825, 2, 131061, 589825, 2, 65525, 589825, 2, -11, 589825, 2, -65547, 589825, 2, -131083, 589825, 2, -196619, 589825, 2, -262155, 589825, 2, -327691, 589825, 2, -393227, 589825, 2, -458763, 589825, 2, -524299, 589825, 2, -589835, 655361, 0, 3014644, 589825, 3, 2949108, 589825, 2, 2883572, 589825, 2, 2818036, 589825, 2, 2752500, 589825, 2, 2686964, 589825, 2, 2621428, 589825, 2, 2555892, 589825, 2, 2490356, 589825, 2, 2424820, 589825, 2, 2359284, 589825, 2, 2293748, 589825, 2, 2228212, 589825, 2, 2162676, 589825, 2, 2097140, 589825, 2, 2031604, 589825, 2, 1966068, 589825, 2, 1900532, 589825, 2, 1834996, 589825, 2, 1769460, 589825, 2, 1703924, 589825, 2, 1638388, 589825, 2, 1572852, 589825, 2, 1507316, 589825, 2, 1441780, 589825, 2, 1376244, 589825, 2, 1310708, 589825, 2, 1245172, 589825, 2, 1179636, 589825, 2, 1114100, 589825, 2, 1048564, 589825, 2, 983028, 589825, 2, 917492, 589825, 2, 851956, 589825, 2, 786420, 589825, 2, 720884, 589825, 2, 655348, 589825, 2, 589812, 589825, 2, 524276, 589825, 2, 458740, 589825, 2, 393204, 589825, 2, 327668, 589825, 2, 262132, 589825, 2, 196596, 589825, 2, 131060, 589825, 2, 65524, 589825, 2, -12, 589825, 2, -65548, 589825, 2, -131084, 589825, 2, -196620, 589825, 2, -262156, 589825, 2, -327692, 589825, 2, -393228, 589825, 2, -458764, 589825, 2, -524300, 589825, 2, -589836, 655361, 0, 3014643, 524289, 3, 2949107, 524289, 1, 2883571, 524289, 1, 2818035, 524289, 1, 2752499, 524289, 1, 2686963, 524289, 1, 2621427, 524289, 1, 2555891, 524289, 1, 2490355, 524289, 1, 2424819, 524289, 1, 2359283, 524289, 1, 2293747, 524289, 1, 2228211, 524289, 1, 2162675, 524289, 1, 2097139, 524289, 1, 2031603, 524289, 1, 1966067, 524289, 1, 1900531, 524289, 1, 1834995, 524289, 1, 1769459, 524289, 1, 1703923, 524289, 1, 1638387, 524289, 1, 1572851, 524289, 1, 1507315, 524289, 1, 1441779, 524289, 1, 1376243, 524289, 1, 1310707, 524289, 1, 1245171, 524289, 1, 1179635, 524289, 1, 1114099, 524289, 1, 1048563, 524289, 1, 983027, 524289, 1, 917491, 524289, 1, 851955, 524289, 1, 786419, 524289, 1, 720883, 524289, 1, 655347, 524289, 1, 589811, 524289, 1, 524275, 524289, 1, 458739, 524289, 1, 393203, 524289, 1, 327667, 524289, 1, 262131, 524289, 1, 196595, 524289, 1, 131059, 524289, 1, 65523, 524289, 1, -13, 524289, 1, -65549, 524289, 1, -131085, 524289, 1, -196621, 524289, 1, -262157, 524289, 1, -327693, 524289, 1, -393229, 524289, 1, -458765, 524289, 1, -524301, 524289, 1, -589837, 524289, 0) +script = ExtResource("3_n0wjg") +start_area_corner_size = 3 + +[node name="Bunny Generator" type="Node2D" parent="." node_paths=PackedStringArray("player")] +script = ExtResource("4_0by8r") +bunny_prefab = ExtResource("5_ghq1m") +player = NodePath("../Player") + +[node name="Player" type="CharacterBody2D" parent="." node_paths=PackedStringArray("animation_player")] +position = Vector2(1440, 810) +collision_layer = 0 +script = ExtResource("6_o5qq4") +animation_player = NodePath("Player Animator") + +[node name="Player Sprite" type="Sprite2D" parent="Player"] +position = Vector2(0, -20) +texture = ExtResource("7_we2bi") +hframes = 8 +vframes = 4 + +[node name="Player Collider" type="CollisionPolygon2D" parent="Player"] +position = Vector2(2, -24) +polygon = PackedVector2Array(12, 32, -16, 32, -16, -24, 12, -24) + +[node name="Player Camera" type="Camera2D" parent="Player"] +position = Vector2(0, -25) +zoom = Vector2(2, 2) +position_smoothing_enabled = true +drag_horizontal_enabled = true +drag_vertical_enabled = true +editor_draw_drag_margin = true + +[node name="Player Animator" type="AnimationPlayer" parent="Player"] +libraries = { +"": SubResource("AnimationLibrary_bi1h3") +} + +[node name="WeaponController" type="Node2D" parent="Player"] +position = Vector2(0, -16) +script = ExtResource("8_p0li1") +projectile_prefab = ExtResource("9_k5fai") diff --git a/Scenes/Main Menu.tscn b/Scenes/Main Menu.tscn index be1520a..37a2a36 100644 --- a/Scenes/Main Menu.tscn +++ b/Scenes/Main Menu.tscn @@ -1,22 +1,22 @@ [gd_scene load_steps=14 format=3 uid="uid://4fysk8vaw3e1"] [ext_resource type="Script" path="res://Scripts/UI/MainMenuManager.gd" id="1_qepq0"] -[ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/Easter Egg/Shadow.png" id="2_8o6th"] -[ext_resource type="PackedScene" uid="uid://c4btepmue6d7p" path="res://Scenes/Game.tscn" id="2_28004"] -[ext_resource type="Texture2D" uid="uid://daat37cyg0go5" path="res://Assets/Sprites/Easter Egg/Egg 3.png" id="3_1e3fe"] +[ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png" id="2_8o6th"] +[ext_resource type="PackedScene" uid="uid://dkcl1ycmxpilw" path="res://Scenes/GameBunnyAnims.tscn" id="2_alimv"] +[ext_resource type="Texture2D" uid="uid://daat37cyg0go5" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png" id="3_1e3fe"] [ext_resource type="PackedScene" uid="uid://cbfcolm6mjolp" path="res://Prefabs/Settings Menu.tscn" id="3_r3r61"] -[ext_resource type="Texture2D" uid="uid://dhvvw4yckl8x7" path="res://Assets/Sprites/Props/Cake.png" id="5_7ull8"] -[ext_resource type="Texture2D" uid="uid://c3yg6u8yncau3" path="res://Assets/Sprites/Easter Egg/Egg 2.png" id="6_45o7d"] -[ext_resource type="Texture2D" uid="uid://cp84ssaqs3pmp" path="res://Assets/Sprites/UI Elements/Jesus.png" id="6_wnx18"] -[ext_resource type="Texture2D" uid="uid://dkotcqflp3e32" path="res://Assets/Sprites/Easter Egg/Egg 1.png" id="7_285vd"] +[ext_resource type="Texture2D" uid="uid://dhvvw4yckl8x7" path="res://Assets/Sprites/Start Menu Old/Cake.png" id="5_7ull8"] +[ext_resource type="Texture2D" uid="uid://c3yg6u8yncau3" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png" id="6_45o7d"] +[ext_resource type="Texture2D" uid="uid://cp84ssaqs3pmp" path="res://Assets/Sprites/Start Menu Old/Jesus.png" id="6_wnx18"] +[ext_resource type="Texture2D" uid="uid://dkotcqflp3e32" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png" id="7_285vd"] [ext_resource type="Theme" uid="uid://o3vg845para" path="res://Assets/UI_Theme.tres" id="8_lr748"] [ext_resource type="Script" path="res://Scripts/UI/MenuButton.gd" id="9_2cu5l"] -[ext_resource type="Texture2D" uid="uid://6snf183fgfo5" path="res://Assets/Sprites/UI Elements/Cross.png" id="12_dhfc0"] +[ext_resource type="Texture2D" uid="uid://6snf183fgfo5" path="res://Assets/Sprites/Start Menu Old/Cross.png" id="12_dhfc0"] [ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/Temp Music/omw-to-beat-the-big-bad.wav" id="13_3j724"] [node name="MainMenu" type="Node" node_paths=PackedStringArray("default_focus")] script = ExtResource("1_qepq0") -game_scene = ExtResource("2_28004") +game_scene = ExtResource("2_alimv") settings_scene = ExtResource("3_r3r61") default_focus = NodePath("MainVBox/ButtonsVbox/PlayButton") diff --git a/Scripts/EntitySystem/Bunny.gd b/Scripts/EntitySystem/Bunny.gd index 3f8a2c9..5889c6a 100644 --- a/Scripts/EntitySystem/Bunny.gd +++ b/Scripts/EntitySystem/Bunny.gd @@ -1,6 +1,7 @@ extends CharacterBody2D class_name Bunny +@export var animation_player : AnimationPlayer @export var min_distance_to_player := 80.0 @export var max_distance_to_player := 800.0 @export var agent : NavigationAgent2D @@ -33,6 +34,7 @@ func _physics_process(delta): dir = self.global_position.direction_to(next_location).normalized() if self.global_position.distance_to(player.global_position) > min_distance_to_player: self.velocity = dir * delta * 60 * speed + update_animation() if delta > 0.5: print(delta) move_and_slide() @@ -64,8 +66,19 @@ func sub_on_death(callback : Callable): on_death_callbacks.push_front(callback) pass +func update_animation(): + var move_vector = Vector2(1 if velocity.x > 0 else (-1 if velocity.x < 0 else 0), 1 if velocity.y > 0 else (-1 if velocity.y < 0 else 0)) + match move_vector: + Vector2.ZERO: animation_player.play("Idle") + Vector2.LEFT: animation_player.play("MoveLeft") + Vector2.RIGHT: animation_player.play("MoveRight") + Vector2.UP: animation_player.play("MoveUp") + Vector2.DOWN: animation_player.play("MoveDown") + _: handle_diagonal_animations(move_vector) + pass - - - - +func handle_diagonal_animations(dir : Vector2): + if (dir.y > 0 and dir.x < 0) or (dir.y < 0 and dir.x < 0): animation_player.play("MoveLeft") + elif (dir.y > 0 and dir.x > 0) or (dir.y < 0 and dir.x > 0): animation_player.play("MoveRight") + else: animation_player.play("Idle") + pass From 364ec9a959c0e7225cb2562dd2cb43877fe6ebed Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Mon, 10 Apr 2023 22:02:00 +0200 Subject: [PATCH 05/26] Player Movement and Attack Controller support --- Scripts/PlayerController.gd | 3 +- Scripts/WeaponSystem/WeaponController.gd | 2 +- project.godot | 44 +++++++++++++++++++++--- 3 files changed, 42 insertions(+), 7 deletions(-) diff --git a/Scripts/PlayerController.gd b/Scripts/PlayerController.gd index 4a46923..e77f733 100644 --- a/Scripts/PlayerController.gd +++ b/Scripts/PlayerController.gd @@ -10,7 +10,8 @@ func _physics_process(delta : float): func get_move_input_vector() -> Vector2: var input_direction = Input.get_vector("move_left", "move_right", "move_up", "move_down").normalized() - return input_direction + var input_direction_controller = Input.get_vector("move_left_controller", "move_right_controller", "move_up_controller", "move_down_controller").normalized() + return input_direction_controller if input_direction_controller.length() > input_direction.length() else input_direction_controller func update_player_movement(delta : float): var input = get_move_input_vector() diff --git a/Scripts/WeaponSystem/WeaponController.gd b/Scripts/WeaponSystem/WeaponController.gd index a4824f8..329d053 100644 --- a/Scripts/WeaponSystem/WeaponController.gd +++ b/Scripts/WeaponSystem/WeaponController.gd @@ -6,7 +6,7 @@ extends Node2D func _process(_delta): rotate_to_pointer() - if Input.is_action_just_pressed("attack"): + if Input.is_action_just_pressed("attack") or Input.is_action_just_pressed("attack_controller"): spawn_projectile(self.global_position, self.rotation, 350.0, 1) pass diff --git a/project.godot b/project.godot index 79d1506..854a186 100644 --- a/project.godot +++ b/project.godot @@ -41,6 +41,20 @@ theme/custom="res://Assets/UI_Theme.tres" [input] +ui_accept={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194309,"physical_keycode":0,"key_label":0,"unicode":4194309,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194310,"physical_keycode":0,"key_label":0,"unicode":4194310,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"key_label":0,"unicode":32,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":true,"script":null) +] +} +ui_select={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"key_label":0,"unicode":32,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":3,"pressure":0.0,"pressed":true,"script":null) +] +} ui_left={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194319,"physical_keycode":0,"key_label":0,"unicode":4194319,"echo":false,"script":null) @@ -72,35 +86,55 @@ ui_down={ move_left={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":-1.0,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"echo":false,"script":null) ] } move_right={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":1.0,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"echo":false,"script":null) ] } move_up={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":-1.0,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"echo":false,"script":null) ] } move_down={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":1.0,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"echo":false,"script":null) ] } attack={ "deadzone": 0.5, "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":1,"position":Vector2(139, 6),"global_position":Vector2(143, 49),"factor":1.0,"button_index":1,"pressed":true,"double_click":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":false,"script":null) +] +} +move_left_controller={ +"deadzone": 0.5, +"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":-1.0,"script":null) +] +} +move_right_controller={ +"deadzone": 0.5, +"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":1.0,"script":null) +] +} +move_up_controller={ +"deadzone": 0.5, +"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":-1.0,"script":null) +] +} +move_down_controller={ +"deadzone": 0.5, +"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":1.0,"script":null) +] +} +attack_controller={ +"deadzone": 0.5, +"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":false,"script":null) ] } From b45a090d236cdb36c5d2c288bd9465f512295df0 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Mon, 10 Apr 2023 22:18:16 +0200 Subject: [PATCH 06/26] Controler Aim --- Scenes/Main Menu.tscn | 14 +++++++------- Scripts/PlayerController.gd | 5 +++-- Scripts/WeaponSystem/WeaponController.gd | 8 ++++++-- project.godot | 22 +++++++++++++++++++++- 4 files changed, 37 insertions(+), 12 deletions(-) diff --git a/Scenes/Main Menu.tscn b/Scenes/Main Menu.tscn index be1520a..a38e2fd 100644 --- a/Scenes/Main Menu.tscn +++ b/Scenes/Main Menu.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=14 format=3 uid="uid://4fysk8vaw3e1"] [ext_resource type="Script" path="res://Scripts/UI/MainMenuManager.gd" id="1_qepq0"] -[ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/Easter Egg/Shadow.png" id="2_8o6th"] +[ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png" id="2_8o6th"] [ext_resource type="PackedScene" uid="uid://c4btepmue6d7p" path="res://Scenes/Game.tscn" id="2_28004"] -[ext_resource type="Texture2D" uid="uid://daat37cyg0go5" path="res://Assets/Sprites/Easter Egg/Egg 3.png" id="3_1e3fe"] +[ext_resource type="Texture2D" uid="uid://daat37cyg0go5" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png" id="3_1e3fe"] [ext_resource type="PackedScene" uid="uid://cbfcolm6mjolp" path="res://Prefabs/Settings Menu.tscn" id="3_r3r61"] -[ext_resource type="Texture2D" uid="uid://dhvvw4yckl8x7" path="res://Assets/Sprites/Props/Cake.png" id="5_7ull8"] -[ext_resource type="Texture2D" uid="uid://c3yg6u8yncau3" path="res://Assets/Sprites/Easter Egg/Egg 2.png" id="6_45o7d"] -[ext_resource type="Texture2D" uid="uid://cp84ssaqs3pmp" path="res://Assets/Sprites/UI Elements/Jesus.png" id="6_wnx18"] -[ext_resource type="Texture2D" uid="uid://dkotcqflp3e32" path="res://Assets/Sprites/Easter Egg/Egg 1.png" id="7_285vd"] +[ext_resource type="Texture2D" uid="uid://dhvvw4yckl8x7" path="res://Assets/Sprites/Start Menu Old/Cake.png" id="5_7ull8"] +[ext_resource type="Texture2D" uid="uid://c3yg6u8yncau3" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png" id="6_45o7d"] +[ext_resource type="Texture2D" uid="uid://cp84ssaqs3pmp" path="res://Assets/Sprites/Start Menu Old/Jesus.png" id="6_wnx18"] +[ext_resource type="Texture2D" uid="uid://dkotcqflp3e32" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png" id="7_285vd"] [ext_resource type="Theme" uid="uid://o3vg845para" path="res://Assets/UI_Theme.tres" id="8_lr748"] [ext_resource type="Script" path="res://Scripts/UI/MenuButton.gd" id="9_2cu5l"] -[ext_resource type="Texture2D" uid="uid://6snf183fgfo5" path="res://Assets/Sprites/UI Elements/Cross.png" id="12_dhfc0"] +[ext_resource type="Texture2D" uid="uid://6snf183fgfo5" path="res://Assets/Sprites/Start Menu Old/Cross.png" id="12_dhfc0"] [ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/Temp Music/omw-to-beat-the-big-bad.wav" id="13_3j724"] [node name="MainMenu" type="Node" node_paths=PackedStringArray("default_focus")] diff --git a/Scripts/PlayerController.gd b/Scripts/PlayerController.gd index e77f733..074d327 100644 --- a/Scripts/PlayerController.gd +++ b/Scripts/PlayerController.gd @@ -10,10 +10,11 @@ func _physics_process(delta : float): func get_move_input_vector() -> Vector2: var input_direction = Input.get_vector("move_left", "move_right", "move_up", "move_down").normalized() - var input_direction_controller = Input.get_vector("move_left_controller", "move_right_controller", "move_up_controller", "move_down_controller").normalized() - return input_direction_controller if input_direction_controller.length() > input_direction.length() else input_direction_controller + var input_direction_controller = Input.get_vector("move_left_controller", "move_right_controller", "move_up_controller", "move_down_controller") + return (input_direction if not input_direction_controller.length() > input_direction.length() else input_direction_controller.normalized()) func update_player_movement(delta : float): + print(get_move_input_vector()) var input = get_move_input_vector() # Damp Movement if not moving, Accelerate if Moving diff --git a/Scripts/WeaponSystem/WeaponController.gd b/Scripts/WeaponSystem/WeaponController.gd index 329d053..9de0e80 100644 --- a/Scripts/WeaponSystem/WeaponController.gd +++ b/Scripts/WeaponSystem/WeaponController.gd @@ -9,9 +9,13 @@ func _process(_delta): if Input.is_action_just_pressed("attack") or Input.is_action_just_pressed("attack_controller"): spawn_projectile(self.global_position, self.rotation, 350.0, 1) pass - + +func get_aim_pos() -> Vector2: + var aim_dir_controller = Input.get_vector("aim_left_controller", "aim_right_controller", "aim_up_controller", "aim_down_controller").normalized() + return get_global_mouse_position() if aim_dir_controller.length() == 0 else self.global_position + aim_dir_controller + func rotate_to_pointer(): - look_at(get_global_mouse_position()) + look_at(get_aim_pos()) #TODO Implement Joystick Aiming func spawn_projectile(pos : Vector2, dir : float, speed: float, damage : int): diff --git a/project.godot b/project.godot index 854a186..94e6dba 100644 --- a/project.godot +++ b/project.godot @@ -134,7 +134,27 @@ move_down_controller={ } attack_controller={ "deadzone": 0.5, -"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":false,"script":null) +"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":10,"pressure":0.0,"pressed":true,"script":null) +] +} +aim_left_controller={ +"deadzone": 0.5, +"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":2,"axis_value":-1.0,"script":null) +] +} +aim_right_controller={ +"deadzone": 0.5, +"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":2,"axis_value":1.0,"script":null) +] +} +aim_up_controller={ +"deadzone": 0.5, +"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":-1.0,"script":null) +] +} +aim_down_controller={ +"deadzone": 0.5, +"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":1.0,"script":null) ] } From 02f141a6ef389c7fff3b8bea3ac39fd8f3632142 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Mon, 10 Apr 2023 22:19:54 +0200 Subject: [PATCH 07/26] Code Cleaning --- Scripts/PlayerController.gd | 1 - Scripts/WeaponSystem/WeaponController.gd | 1 - 2 files changed, 2 deletions(-) diff --git a/Scripts/PlayerController.gd b/Scripts/PlayerController.gd index 074d327..1f77e73 100644 --- a/Scripts/PlayerController.gd +++ b/Scripts/PlayerController.gd @@ -14,7 +14,6 @@ func get_move_input_vector() -> Vector2: return (input_direction if not input_direction_controller.length() > input_direction.length() else input_direction_controller.normalized()) func update_player_movement(delta : float): - print(get_move_input_vector()) var input = get_move_input_vector() # Damp Movement if not moving, Accelerate if Moving diff --git a/Scripts/WeaponSystem/WeaponController.gd b/Scripts/WeaponSystem/WeaponController.gd index 9de0e80..f501ddb 100644 --- a/Scripts/WeaponSystem/WeaponController.gd +++ b/Scripts/WeaponSystem/WeaponController.gd @@ -16,7 +16,6 @@ func get_aim_pos() -> Vector2: func rotate_to_pointer(): look_at(get_aim_pos()) - #TODO Implement Joystick Aiming func spawn_projectile(pos : Vector2, dir : float, speed: float, damage : int): var projectile = projectilePrefab.instantiate() From cf7c9fcc14471f4f0ced5f21e60fa8d9e0e9af1e Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Mon, 10 Apr 2023 22:46:15 +0200 Subject: [PATCH 08/26] Full Controller Menu Support --- Prefabs/Settings Menu.tscn | 10 +++++++++- Scripts/UI/MainMenuManager.gd | 1 + Scripts/UI/SettingsMenu.gd | 35 +++++++++++++++++++++++++++++++++++ project.godot | 25 ++++++++++++++++++++++++- 4 files changed, 69 insertions(+), 2 deletions(-) diff --git a/Prefabs/Settings Menu.tscn b/Prefabs/Settings Menu.tscn index 2a5ae6f..e827acc 100644 --- a/Prefabs/Settings Menu.tscn +++ b/Prefabs/Settings Menu.tscn @@ -4,8 +4,13 @@ [ext_resource type="Script" path="res://Scripts/UI/Remaping/RemapController.gd" id="2_2f8ap"] [ext_resource type="Script" path="res://Scripts/UI/Remaping/RemapButton.gd" id="2_4asaa"] -[node name="SettingsMenu" type="Node" node_paths=PackedStringArray("display_options_button", "vsync_toggle", "resolutions_options_button", "master_volume_slider", "music_volume_slider", "sfx_volume_slider")] +[node name="SettingsMenu" type="Node" node_paths=PackedStringArray("back_button", "tab_container", "bottom_item_video", "bottom_item_audio", "bottom_item_controls", "display_options_button", "vsync_toggle", "resolutions_options_button", "master_volume_slider", "music_volume_slider", "sfx_volume_slider")] script = ExtResource("1_2rgd2") +back_button = NodePath("Back Button") +tab_container = NodePath("CenterContainer/SettingsTabs") +bottom_item_video = NodePath("CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/ResolutionsOptions") +bottom_item_audio = NodePath("CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/SFXVolSlider") +bottom_item_controls = NodePath("CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveRightRemapButton") display_options_button = NodePath("CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/DisplayModeOptions") vsync_toggle = NodePath("CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/VsyncButton") resolutions_options_button = NodePath("CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/ResolutionsOptions") @@ -113,6 +118,7 @@ vertical_alignment = 1 custom_minimum_size = Vector2(500, 40) layout_mode = 2 size_flags_horizontal = 10 +focus_neighbor_bottom = NodePath("../../../../../../Back Button") fit_to_longest_item = false [node name="Audio" type="VBoxContainer" parent="CenterContainer/SettingsTabs"] @@ -175,6 +181,7 @@ vertical_alignment = 1 custom_minimum_size = Vector2(500, 40) layout_mode = 2 size_flags_horizontal = 10 +focus_neighbor_bottom = NodePath("../../../../../../Back Button") min_value = -72.0 max_value = 0.0 @@ -261,6 +268,7 @@ vertical_alignment = 1 custom_minimum_size = Vector2(500, 40) layout_mode = 2 size_flags_horizontal = 10 +focus_neighbor_bottom = NodePath("../../../../../../Back Button") toggle_mode = true script = ExtResource("2_4asaa") input_action_name = "move_right" diff --git a/Scripts/UI/MainMenuManager.gd b/Scripts/UI/MainMenuManager.gd index 06e599a..cd71434 100644 --- a/Scripts/UI/MainMenuManager.gd +++ b/Scripts/UI/MainMenuManager.gd @@ -22,6 +22,7 @@ func _on_play_button_pressed(): func _on_settings_button_pressed(): var settings_scene_instance = load(settings_scene.resource_path).instantiate() + settings_scene_instance.on_back = Callable(func(): default_focus.grab_focus()) get_tree().current_scene.add_child(settings_scene_instance) pass diff --git a/Scripts/UI/SettingsMenu.gd b/Scripts/UI/SettingsMenu.gd index 8b8485e..4368726 100644 --- a/Scripts/UI/SettingsMenu.gd +++ b/Scripts/UI/SettingsMenu.gd @@ -1,10 +1,18 @@ extends Node # Video Settings UI References +@export var back_button : Control +@export var tab_container : TabContainer +@export var bottom_item_video : Control +@export var bottom_item_audio : Control +@export var bottom_item_controls : Control + @export var display_options_button : OptionButton @export var vsync_toggle : CheckButton @export var resolutions_options_button : OptionButton +var on_back : Callable + # Audio Settings UI References @export var master_volume_slider : Slider @export var music_volume_slider : Slider @@ -12,6 +20,9 @@ extends Node # Engine Callbacks func _ready(): + back_button.grab_focus() + back_button.focus_neighbor_top = bottom_item_video.get_path() + add_resolution_items() display_options_button.select(Save.game_data.display_mode) GlobalSettings.set_display_mode(Save.game_data.display_mode) @@ -26,6 +37,29 @@ func _ready(): sfx_volume_slider.value = Save.game_data.sfx_volume GlobalSettings.update_sfx_volume(Save.game_data.sfx_volume) pass + +func _process(delta): + update_change_tab() + pass + +func update_change_tab(): + var do_left = Input.is_action_just_pressed("ui_tab_left") + var do_right = Input.is_action_just_pressed("ui_tab_right") + + if do_left: + var new_rab = tab_container.current_tab - 1 + tab_container.current_tab = new_rab if new_rab >= 0 else tab_container.get_tab_count() - 1 + if do_right: + var new_rab = tab_container.current_tab + 1 + tab_container.current_tab = new_rab if new_rab < tab_container.get_tab_count() else 0 + + if do_left or do_right: + match tab_container.current_tab: + 0: back_button.focus_neighbor_top = bottom_item_video.get_path() + 1: back_button.focus_neighbor_top = bottom_item_audio.get_path() + 2: back_button.focus_neighbor_top = bottom_item_controls.get_path() + back_button.grab_focus() + pass func add_resolution_items(): for key in GlobalSettings.resolutions_dictionary.keys(): @@ -33,6 +67,7 @@ func add_resolution_items(): # Other Buttons func _on_back_pressed(): + on_back.call() queue_free() pass diff --git a/project.godot b/project.godot index 94e6dba..954430a 100644 --- a/project.godot +++ b/project.godot @@ -52,7 +52,12 @@ ui_accept={ ui_select={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"key_label":0,"unicode":32,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":3,"pressure":0.0,"pressed":true,"script":null) +] +} +ui_cancel={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194305,"physical_keycode":0,"key_label":0,"unicode":4194305,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":1,"pressure":0.0,"pressed":true,"script":null) ] } ui_left={ @@ -60,6 +65,7 @@ ui_left={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194319,"physical_keycode":0,"key_label":0,"unicode":4194319,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":-1.0,"script":null) ] } ui_right={ @@ -67,6 +73,7 @@ ui_right={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194321,"physical_keycode":0,"key_label":0,"unicode":4194321,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":1.0,"script":null) ] } ui_up={ @@ -74,6 +81,7 @@ ui_up={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194320,"physical_keycode":0,"key_label":0,"unicode":4194320,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":-1.0,"script":null) ] } ui_down={ @@ -81,6 +89,7 @@ ui_down={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194322,"physical_keycode":0,"key_label":0,"unicode":4194322,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":1.0,"script":null) ] } move_left={ @@ -157,6 +166,20 @@ aim_down_controller={ "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":1.0,"script":null) ] } +ui_tab_left={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":9,"pressure":0.0,"pressed":true,"script":null) +] +} +ui_tab_right={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":10,"pressure":0.0,"pressed":true,"script":null) +] +} [layer_names] From b69e705ea3d1cff49d7be843be566c8e15b4552d Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Mon, 10 Apr 2023 23:31:07 +0200 Subject: [PATCH 09/26] Fixing Up UI --- Assets/{Temp Music => Music}/awesomeness.wav | Bin .../awesomeness.wav.import | 6 +- .../default_bus_layout.tres | 0 .../omw-to-beat-the-big-bad.wav | Bin .../omw-to-beat-the-big-bad.wav.import | 6 +- Assets/Sprites/Start Menu Old/Cake.png | Bin 1280 -> 0 bytes Assets/Sprites/Start Menu Old/Cake.png.import | 34 -- Assets/Sprites/Start Menu Old/Cross.png | Bin 1673 -> 0 bytes .../Sprites/Start Menu Old/Cross.png.import | 34 -- Assets/Sprites/Start Menu Old/Jesus.png | Bin 563 -> 0 bytes .../Sprites/Start Menu Old/Jesus.png.import | 34 -- Assets/UI/Tab/tap_selected.tres | 1 + Assets/UI/{UI_Theme.tres => Theme.tres} | 214 ++++++------- Assets/UI_Theme.tres | 109 ------- Prefabs/Settings Menu.tscn | 219 ++++++------- Scenes/Main Menu.tscn | 301 +++++++++--------- Scenes/Main Menu.tscn.save | 282 ++++++++++++++++ Scenes/Test.tscn | 169 ---------- Scripts/UI/MainMenuManager.gd | 2 +- Scripts/UI/SettingsMenu.gd | 2 +- project.godot | 14 +- 21 files changed, 648 insertions(+), 779 deletions(-) rename Assets/{Temp Music => Music}/awesomeness.wav (100%) rename Assets/{Temp Music => Music}/awesomeness.wav.import (54%) rename Assets/{Temp Music => Music}/default_bus_layout.tres (100%) rename Assets/{Temp Music => Music}/omw-to-beat-the-big-bad.wav (100%) rename Assets/{Temp Music => Music}/omw-to-beat-the-big-bad.wav.import (50%) delete mode 100644 Assets/Sprites/Start Menu Old/Cake.png delete mode 100644 Assets/Sprites/Start Menu Old/Cake.png.import delete mode 100644 Assets/Sprites/Start Menu Old/Cross.png delete mode 100644 Assets/Sprites/Start Menu Old/Cross.png.import delete mode 100644 Assets/Sprites/Start Menu Old/Jesus.png delete mode 100644 Assets/Sprites/Start Menu Old/Jesus.png.import rename Assets/UI/{UI_Theme.tres => Theme.tres} (61%) delete mode 100644 Assets/UI_Theme.tres create mode 100644 Scenes/Main Menu.tscn.save delete mode 100644 Scenes/Test.tscn diff --git a/Assets/Temp Music/awesomeness.wav b/Assets/Music/awesomeness.wav similarity index 100% rename from Assets/Temp Music/awesomeness.wav rename to Assets/Music/awesomeness.wav diff --git a/Assets/Temp Music/awesomeness.wav.import b/Assets/Music/awesomeness.wav.import similarity index 54% rename from Assets/Temp Music/awesomeness.wav.import rename to Assets/Music/awesomeness.wav.import index ef0f2c9..a86cfc0 100644 --- a/Assets/Temp Music/awesomeness.wav.import +++ b/Assets/Music/awesomeness.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://dpbyjnyg765r7" -path="res://.godot/imported/awesomeness.wav-59f1c1423f54ec46cf96ddbcf1a5f126.sample" +path="res://.godot/imported/awesomeness.wav-a3e25c2b7cc98b82991938c6ea85b10b.sample" [deps] -source_file="res://Assets/Temp Music/awesomeness.wav" -dest_files=["res://.godot/imported/awesomeness.wav-59f1c1423f54ec46cf96ddbcf1a5f126.sample"] +source_file="res://Assets/Music/awesomeness.wav" +dest_files=["res://.godot/imported/awesomeness.wav-a3e25c2b7cc98b82991938c6ea85b10b.sample"] [params] diff --git a/Assets/Temp Music/default_bus_layout.tres b/Assets/Music/default_bus_layout.tres similarity index 100% rename from Assets/Temp Music/default_bus_layout.tres rename to Assets/Music/default_bus_layout.tres diff --git a/Assets/Temp Music/omw-to-beat-the-big-bad.wav b/Assets/Music/omw-to-beat-the-big-bad.wav similarity index 100% rename from Assets/Temp Music/omw-to-beat-the-big-bad.wav rename to Assets/Music/omw-to-beat-the-big-bad.wav diff --git a/Assets/Temp Music/omw-to-beat-the-big-bad.wav.import b/Assets/Music/omw-to-beat-the-big-bad.wav.import similarity index 50% rename from Assets/Temp Music/omw-to-beat-the-big-bad.wav.import rename to Assets/Music/omw-to-beat-the-big-bad.wav.import index 87f4127..b03e350 100644 --- a/Assets/Temp Music/omw-to-beat-the-big-bad.wav.import +++ b/Assets/Music/omw-to-beat-the-big-bad.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://c6nf5s6xy2uii" -path="res://.godot/imported/omw-to-beat-the-big-bad.wav-7f8a9a2e19afe1786d6b9f29ff762163.sample" +path="res://.godot/imported/omw-to-beat-the-big-bad.wav-c6b466e6681b770ddf1c916b506747ec.sample" [deps] -source_file="res://Assets/Temp Music/omw-to-beat-the-big-bad.wav" -dest_files=["res://.godot/imported/omw-to-beat-the-big-bad.wav-7f8a9a2e19afe1786d6b9f29ff762163.sample"] +source_file="res://Assets/Music/omw-to-beat-the-big-bad.wav" +dest_files=["res://.godot/imported/omw-to-beat-the-big-bad.wav-c6b466e6681b770ddf1c916b506747ec.sample"] [params] diff --git a/Assets/Sprites/Start Menu Old/Cake.png b/Assets/Sprites/Start Menu Old/Cake.png deleted file mode 100644 index 0e508de5f11110b65e5e1858cbec34fe6f800c66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1280 zcmV+b1^@bqP)Px(x=BPqRCr$PnoVmIK@f%~1W}OH5P}3kkcb~Aje?*ef*=Uu!9ULrjbM&m;gL@crv+j`$MWd7KA7O5PbqbFM`lG01&?opy>{1 zd<}@1|CD}FiXaW#_+^koh_wRrjRRtCh@zwb?7#c^aC-x|@nkj1hA0{Uh(C1Xa2vwh z-FH3T5Jd&R#S?{X0NV~|SPGEsw|ouY8yu=?bbVWp1i+9iZiRKLaQN!VN&?dC{ozDAwTs=?d-$xWQ8w zOaO>}m1y&cepy~h51+kXX%|7h8>E||P!Y7!3Eycckq2SR0N{`ahSvo_0HMfR%bF)b zh^@M~J6Ebgpj!R4IBSj5`40sTSY`;Z>tw zG!@(qs0tti;rHNXvU77VW8*5;FS9a41rSPL3qb4q4z(_FEI0KFCf~XfvXfdek~wCC>_&hyrXR> z+S(jK5X@zeI?@2hL3)`UWyI4pZUEF6F7N_Cdeq?xEvKdH(2hS0;VzXy>KXuEC^cu$ zWMz>GrBM+}^QiK1wP%!l51^=c4ggLK)hlZ+pgs@qqyUH(NfS?z^jf+IfI_PPuK^2- zkJC9%jNizt0@mQxWAa7-unJKg0O=~t(xG;|@70aJ$%WIm+NZQfW4S4?{&Obnq_tz~`3wyWv{N@a01{>uODm#s z7pm1C1c8L(h1yjc0Cc?a<5&7|ZLR&c|MWOCSxmSW03d#3@2*VhmIiQa;$_;=oB72| z{Q>|9!2>|1iGRQW$rK zM>KCED>{8Ah4ZN6+C1^p&i(Va1b{(2Ztw`^fJiWod2Vx85dbafJq5s1!s`YP5UmYF zhaxVosl@>@6>w~&L=}OaYf<1d!8o7y-vCz%cmZe=mrJNepeMSaeh~4l0FVRnC&yZS z@QNi!T2%A;;G#Vdm;L1yL2Uwc0>~3-eIE?~pOp1a(W>sCaiq2R*kz*5uP^NYFMul1 q^<3K*0IZ2x?(hhtHdRGhPx*LrFwIRA@u(m}_hl*A>TqcV>2W*Sq%GUcVM&du^6Dw1AZo8d4=~(^PSaA*GR$ zrfsCQgyc*6rHay$6erH334P>ar79^XO4F7`YUKbX;6!R3%7-+N$R!m*;1>qg54`p+ zUa!5gGq;*q3@pZU?M6aX_kJ18z2~0uzyEvAnKMUlork#2_9*};Fi>FNf0Kc2ZS8*( zn3$GzDUB#9ySsjI?_%@Hq8NCv^@&ix>-#X7o~;`*%UKp`xoA(uK0sIGP$HGO<+Vf4 zNAm@;C;&g&@`8-bq?uCd2-Vz(Wo0g7z=fPRg2y_~Z#y5)TW{Wiwxz9YJLJH0fR!t5 z!!(Wghg95H!~59X^<3V1^A@zNJ=E4NPo;`!XxOkI!*cX3c6B|Qx8A%33jhiX{C_a8 zt?kLq_^e4Llg{>m2RSqCN0i;{oN%EbCqAOKXo|bmG|&+AJ7THX89Z(e zKYjfOzM2gPSD7bpUjxd8g7OK1w;lARpxBIx(h+U)0s`Y^}(ds!X1 z0n0LZ^e;#7`^pjJS=pSS=*V;LGnI_-;Ljt}-bU{nE5?>&kcyaO(rZVrST=|)pk zp1NlZrUXk$P7V#y+|Y=;;K-ut>yA@r>3dS4 zKEdZ2BWRlKc-i73;C1onpFV)#6`>gagct9>nRqIVMDnk`UP}GN)Kyn=VmQGcKkTPg zQ8;ZRk<#i$D`NNl=UQ{T$#%%QrJK0Fm^Wi1{BT_v^}zsTfdGanolvstz{3OMC{}JH zq%D;%G?d|X>5RuGNzF{tTpuPnndIl4pRlR2mKJw_-^F@!>V3a_6?g^te`!0#=>>r$DVI-lbL?3BR>HB_Uj#pnf`pyhF z*R!^%iS2*=nAr)Kg4FfhCkG*~vudbcVkoET4rCy_%mJ$xuqH8X8ojbWOfQL7C$S+Hs3V$haMUC%? z^>%h1{M8TUPW$ktCnwj}c>-x8gHTjwdU<8F^UOxdEc<)T#9!Y3OzGU7`#0}+WrK8Y zDYIlCQc=&V69c@wuj8Wc&t#P%*3whmGW~ySsn0=W?naYHNQWWyn9DOM9rS zY<8A1=B0lF8UH869_>53x}MG1_pP?}2i7Y3V}9MoiFCsL3a*>en*-p%*6ooocXsK} z-km4sUG#<0d@xl)IQ*q~%XS)Hs3dQ_XM1Eekzl#Igx3yT(!Hp%+_reFqGYlE1Ww|; z+9|I!R{&68puj+ZfdT^s1_}&ZcLo-0RxY7QxukmF%66@-#IpMVOK8(B3BZ*NYg%J5ao^3Pg%KKcp_6d3q7f>L9A TjpRg_00000NkvXXu0mjfWKuot diff --git a/Assets/Sprites/Start Menu Old/Cross.png.import b/Assets/Sprites/Start Menu Old/Cross.png.import deleted file mode 100644 index 57b6643..0000000 --- a/Assets/Sprites/Start Menu Old/Cross.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://6snf183fgfo5" -path="res://.godot/imported/Cross.png-0ee19fa549405b3294c8343e3a8bf496.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Assets/Sprites/Start Menu Old/Cross.png" -dest_files=["res://.godot/imported/Cross.png-0ee19fa549405b3294c8343e3a8bf496.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/Assets/Sprites/Start Menu Old/Jesus.png b/Assets/Sprites/Start Menu Old/Jesus.png deleted file mode 100644 index 15b21a20494c9001565a745b64a809e74cf79053..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 563 zcmV-30?hr1P)YqFm(edAHl%H*iT?Uotc;s1L6z%1q^&dq_TBlV9Jb`5mM1vxp2AK zXZsoy0#B-1oqT@xY{$M7U;s=sM(;0=8?D2G<8#sHR71A7T4_1kJt^`%$%%zfYtNp> zo!Ckk;`Z*8RVym}36Lk*Riy`~Hd#oN6AqR`sz_60v5kgY%&CUZYM&&H9iWP$6xSr; zL8{kGy0~~yt@TRU2X=mBtc3=W(%c3i?IV@CF2Z#sYK@CPFTIyjV2y~F)7T-U%Gp?m zlT$vo@uxxyziPCFu&R|*f~3?Du5aGd&m!6trFfBJNyCjAVo!(=h}oM1I;blo^q5^A z;&&MC_At?;LDUr)>NIJyF(eMjSu%liE4&>-2JImPJ1)%Gj|>vmRo32)bXFx1Vh;?p zq&N!mIBpIxa>6`p8x*THkyp^lOQQAWVk3^{wsk{!W6emFDAk@@C7I`55-h^jhFxc002ovPDHLkV1itt B`KAB> diff --git a/Assets/Sprites/Start Menu Old/Jesus.png.import b/Assets/Sprites/Start Menu Old/Jesus.png.import deleted file mode 100644 index 44ad03a..0000000 --- a/Assets/Sprites/Start Menu Old/Jesus.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cp84ssaqs3pmp" -path="res://.godot/imported/Jesus.png-1b5efe2b1083942c332ddea70bb782c5.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Assets/Sprites/Start Menu Old/Jesus.png" -dest_files=["res://.godot/imported/Jesus.png-1b5efe2b1083942c332ddea70bb782c5.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/Assets/UI/Tab/tap_selected.tres b/Assets/UI/Tab/tap_selected.tres index c014c5e..357fbaf 100644 --- a/Assets/UI/Tab/tap_selected.tres +++ b/Assets/UI/Tab/tap_selected.tres @@ -11,4 +11,5 @@ border_width_top = 4 border_width_right = 4 border_color = Color(0.227451, 0.172549, 0.290196, 1) expand_margin_left = 4.0 +expand_margin_top = 4.0 expand_margin_bottom = 4.0 diff --git a/Assets/UI/UI_Theme.tres b/Assets/UI/Theme.tres similarity index 61% rename from Assets/UI/UI_Theme.tres rename to Assets/UI/Theme.tres index 5c2d7c9..8fa7dc9 100644 --- a/Assets/UI/UI_Theme.tres +++ b/Assets/UI/Theme.tres @@ -1,47 +1,47 @@ -[gd_resource type="Theme" load_steps=47 format=3 uid="uid://bui1mmatapmc8"] +[gd_resource type="Theme" load_steps=47 format=3 uid="uid://babphdknr2kkd"] -[ext_resource type="StyleBox" uid="uid://bb7opkg3aneg4" path="res://Assets/UI/Button/normal.tres" id="1_re3m3"] -[ext_resource type="StyleBox" uid="uid://bmeh7kt6t886w" path="res://Assets/UI/Button/disabled.tres" id="1_wt1wr"] -[ext_resource type="StyleBox" uid="uid://cjyijxvb4qfwy" path="res://Assets/UI/Button/hover.tres" id="2_h7pgg"] -[ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="2_j8kea"] -[ext_resource type="StyleBox" uid="uid://gxy851bdkmb0" path="res://Assets/UI/Button/focus.tres" id="2_nf3et"] -[ext_resource type="StyleBox" uid="uid://cu2rciarim0cc" path="res://Assets/UI/Button/pressed.tres" id="4_de308"] -[ext_resource type="StyleBox" uid="uid://cx486vo60qcpp" path="res://Assets/UI/Edit/normal.tres" id="6_lnycp"] -[ext_resource type="Texture2D" uid="uid://c18dqb1wy3its" path="res://Assets/UI/Check Box/checked.png" id="6_srlcu"] -[ext_resource type="Texture2D" uid="uid://cl8b7x3q77gm0" path="res://Assets/UI/Slider/handle.png" id="6_tsx7l"] -[ext_resource type="StyleBox" uid="uid://cgdxtbanwi5gp" path="res://Assets/UI/Scrollbar/h/grabber.tres" id="6_vjj3k"] -[ext_resource type="StyleBox" uid="uid://dvj15u41tqtnm" path="res://Assets/UI/Edit/readonly.tres" id="7_k2jlw"] -[ext_resource type="Texture2D" uid="uid://b388qxyyqx8q2" path="res://Assets/UI/Slider/handle_disabled.png" id="7_m4hfs"] -[ext_resource type="Texture2D" uid="uid://jta11o1n4c3d" path="res://Assets/UI/Check Box/unchecked.png" id="7_p4k8i"] -[ext_resource type="StyleBox" uid="uid://b5e35dfka2svr" path="res://Assets/UI/Scrollbar/h/grabber_highlight.tres" id="7_yv3p6"] -[ext_resource type="Texture2D" uid="uid://o3ufhj36lo0r" path="res://Assets/UI/Slider/handle_highlight.png" id="8_4qpd7"] -[ext_resource type="StyleBox" uid="uid://b6gse1t3c8ibf" path="res://Assets/UI/Scrollbar/h/grabber_pressed.tres" id="8_dr3de"] -[ext_resource type="Texture2D" uid="uid://je3kjtfx1kr3" path="res://Assets/UI/Button/checked.png" id="8_r3sw2"] -[ext_resource type="Texture2D" uid="uid://dklqdwoqhjm5i" path="res://Assets/UI/Button/unchecked.png" id="9_iytk4"] -[ext_resource type="StyleBox" uid="uid://04efvhwskbr6" path="res://Assets/UI/Scrollbar/h/background.tres" id="9_lv5dx"] -[ext_resource type="StyleBox" uid="uid://b1huhquesnexy" path="res://Assets/UI/Scrollbar/h/background_focus.tres" id="10_npblq"] -[ext_resource type="StyleBox" uid="uid://bwlxiw44285g1" path="res://Assets/UI/Slider/h/fill.tres" id="14_b0thp"] -[ext_resource type="StyleBox" uid="uid://b8mdovvxl7lfl" path="res://Assets/UI/Slider/h/background.tres" id="15_4oqlg"] -[ext_resource type="Texture2D" uid="uid://bj8jxblqmsubn" path="res://Assets/UI/Button/arrow_down.png" id="18_jqhuv"] -[ext_resource type="StyleBox" uid="uid://dhna0fajb2uei" path="res://Assets/UI/Progress/background.tres" id="18_ymgal"] -[ext_resource type="StyleBox" uid="uid://b3i7tjv3ok85r" path="res://Assets/UI/Progress/fill.tres" id="19_1x1m2"] -[ext_resource type="Texture2D" uid="uid://de5dv104noe06" path="res://Assets/UI/Tab/left.png" id="20_skg1s"] -[ext_resource type="StyleBox" uid="uid://cm4uy16ypsdyi" path="res://Assets/UI/Scrollbar/v/grabber.tres" id="20_uo4of"] -[ext_resource type="Texture2D" uid="uid://ce87u4fp6tnik" path="res://Assets/UI/Tab/left_highlight.png" id="21_ivr4w"] -[ext_resource type="StyleBox" uid="uid://cmiivkeqn03sa" path="res://Assets/UI/Scrollbar/v/grabber_highlight.tres" id="21_pjklk"] -[ext_resource type="StyleBox" uid="uid://j31rmst7m2q7" path="res://Assets/UI/Scrollbar/v/grabber_pressed.tres" id="22_rcema"] -[ext_resource type="Texture2D" uid="uid://bqpbxb5whco41" path="res://Assets/UI/Tab/right.png" id="22_tbsa0"] -[ext_resource type="StyleBox" uid="uid://de0w7yppc7e0l" path="res://Assets/UI/Scrollbar/v/background.tres" id="23_1wjoi"] -[ext_resource type="Texture2D" uid="uid://ds6cfed3dmyr3" path="res://Assets/UI/Tab/right_highligh.png" id="23_meyle"] -[ext_resource type="StyleBox" uid="uid://15jbtuchd7r6" path="res://Assets/UI/Scrollbar/v/background_focus.tres" id="24_64ah6"] -[ext_resource type="StyleBox" uid="uid://dnwseiejbfrqq" path="res://Assets/UI/Tab/panel.tres" id="24_ypm5h"] -[ext_resource type="StyleBox" uid="uid://bgecjuqm2jv0w" path="res://Assets/UI/Tab/tab_disabled.tres" id="25_2cr8y"] -[ext_resource type="StyleBox" uid="uid://byrx7smwgsuf0" path="res://Assets/UI/Tab/tap_selected.tres" id="25_ou2yk"] -[ext_resource type="StyleBox" uid="uid://bumc1mixgglv8" path="res://Assets/UI/Slider/v/fill.tres" id="25_pdk86"] -[ext_resource type="StyleBox" uid="uid://0jfr1uwuog0s" path="res://Assets/UI/Slider/v/background.tres" id="26_1odpk"] -[ext_resource type="StyleBox" uid="uid://ddfin4k7slkmn" path="res://Assets/UI/Tab/tap_unselected.tres" id="26_pgono"] +[ext_resource type="StyleBox" uid="uid://bmeh7kt6t886w" path="res://Assets/UI/Button/disabled.tres" id="1_n3up8"] +[ext_resource type="StyleBox" uid="uid://gxy851bdkmb0" path="res://Assets/UI/Button/focus.tres" id="2_ukct7"] +[ext_resource type="StyleBox" uid="uid://cjyijxvb4qfwy" path="res://Assets/UI/Button/hover.tres" id="3_ukadi"] +[ext_resource type="StyleBox" uid="uid://bb7opkg3aneg4" path="res://Assets/UI/Button/normal.tres" id="4_b2mp2"] +[ext_resource type="StyleBox" uid="uid://cu2rciarim0cc" path="res://Assets/UI/Button/pressed.tres" id="5_6rmq1"] +[ext_resource type="Texture2D" uid="uid://c18dqb1wy3its" path="res://Assets/UI/Check Box/checked.png" id="6_re2fr"] +[ext_resource type="Texture2D" uid="uid://jta11o1n4c3d" path="res://Assets/UI/Check Box/unchecked.png" id="7_as124"] +[ext_resource type="Texture2D" uid="uid://je3kjtfx1kr3" path="res://Assets/UI/Button/checked.png" id="8_g1dhe"] +[ext_resource type="Texture2D" uid="uid://dklqdwoqhjm5i" path="res://Assets/UI/Button/unchecked.png" id="9_trcl3"] +[ext_resource type="StyleBox" uid="uid://cgdxtbanwi5gp" path="res://Assets/UI/Scrollbar/h/grabber.tres" id="10_cb1fp"] +[ext_resource type="StyleBox" uid="uid://b5e35dfka2svr" path="res://Assets/UI/Scrollbar/h/grabber_highlight.tres" id="11_s21yb"] +[ext_resource type="StyleBox" uid="uid://b6gse1t3c8ibf" path="res://Assets/UI/Scrollbar/h/grabber_pressed.tres" id="12_fd8p2"] +[ext_resource type="StyleBox" uid="uid://04efvhwskbr6" path="res://Assets/UI/Scrollbar/h/background.tres" id="13_s3ehx"] +[ext_resource type="StyleBox" uid="uid://b1huhquesnexy" path="res://Assets/UI/Scrollbar/h/background_focus.tres" id="14_fwmx8"] +[ext_resource type="Texture2D" uid="uid://cl8b7x3q77gm0" path="res://Assets/UI/Slider/handle.png" id="15_ocljk"] +[ext_resource type="Texture2D" uid="uid://b388qxyyqx8q2" path="res://Assets/UI/Slider/handle_disabled.png" id="16_rbxnn"] +[ext_resource type="Texture2D" uid="uid://o3ufhj36lo0r" path="res://Assets/UI/Slider/handle_highlight.png" id="17_8a3cc"] +[ext_resource type="StyleBox" uid="uid://bwlxiw44285g1" path="res://Assets/UI/Slider/h/fill.tres" id="18_fueyy"] +[ext_resource type="StyleBox" uid="uid://b8mdovvxl7lfl" path="res://Assets/UI/Slider/h/background.tres" id="19_ccnyp"] +[ext_resource type="StyleBox" uid="uid://cx486vo60qcpp" path="res://Assets/UI/Edit/normal.tres" id="20_1xrl8"] +[ext_resource type="StyleBox" uid="uid://dvj15u41tqtnm" path="res://Assets/UI/Edit/readonly.tres" id="21_1jd57"] +[ext_resource type="Texture2D" uid="uid://bj8jxblqmsubn" path="res://Assets/UI/Button/arrow_down.png" id="22_qar1e"] +[ext_resource type="StyleBox" uid="uid://dhna0fajb2uei" path="res://Assets/UI/Progress/background.tres" id="23_r3p5f"] +[ext_resource type="StyleBox" uid="uid://b3i7tjv3ok85r" path="res://Assets/UI/Progress/fill.tres" id="24_twflh"] +[ext_resource type="Texture2D" uid="uid://de5dv104noe06" path="res://Assets/UI/Tab/left.png" id="25_tp1la"] +[ext_resource type="Texture2D" uid="uid://ce87u4fp6tnik" path="res://Assets/UI/Tab/left_highlight.png" id="26_b6do7"] +[ext_resource type="Texture2D" uid="uid://bqpbxb5whco41" path="res://Assets/UI/Tab/right.png" id="27_apyeg"] +[ext_resource type="Texture2D" uid="uid://ds6cfed3dmyr3" path="res://Assets/UI/Tab/right_highligh.png" id="28_h4oun"] +[ext_resource type="StyleBox" uid="uid://dnwseiejbfrqq" path="res://Assets/UI/Tab/panel.tres" id="29_uo2g8"] +[ext_resource type="StyleBox" uid="uid://bgecjuqm2jv0w" path="res://Assets/UI/Tab/tab_disabled.tres" id="30_e041s"] +[ext_resource type="StyleBox" uid="uid://byrx7smwgsuf0" path="res://Assets/UI/Tab/tap_selected.tres" id="31_0n7gu"] +[ext_resource type="StyleBox" uid="uid://ddfin4k7slkmn" path="res://Assets/UI/Tab/tap_unselected.tres" id="32_a2a8b"] +[ext_resource type="StyleBox" uid="uid://cm4uy16ypsdyi" path="res://Assets/UI/Scrollbar/v/grabber.tres" id="33_wjjme"] +[ext_resource type="StyleBox" uid="uid://cmiivkeqn03sa" path="res://Assets/UI/Scrollbar/v/grabber_highlight.tres" id="34_y2stj"] +[ext_resource type="StyleBox" uid="uid://j31rmst7m2q7" path="res://Assets/UI/Scrollbar/v/grabber_pressed.tres" id="35_q0217"] +[ext_resource type="StyleBox" uid="uid://de0w7yppc7e0l" path="res://Assets/UI/Scrollbar/v/background.tres" id="36_bu6rt"] +[ext_resource type="StyleBox" uid="uid://15jbtuchd7r6" path="res://Assets/UI/Scrollbar/v/background_focus.tres" id="37_yr206"] +[ext_resource type="StyleBox" uid="uid://bumc1mixgglv8" path="res://Assets/UI/Slider/v/fill.tres" id="38_wuc1e"] +[ext_resource type="StyleBox" uid="uid://0jfr1uwuog0s" path="res://Assets/UI/Slider/v/background.tres" id="39_dl1e4"] +[ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="40_bmcvq"] -[sub_resource type="Image" id="Image_rlyln"] +[sub_resource type="Image" id="Image_hhwo6"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0), "format": "RGBA8", @@ -51,7 +51,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_g5bup"] -image = SubResource("Image_rlyln") +image = SubResource("Image_hhwo6") [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_sj7h5"] @@ -68,7 +68,7 @@ corner_detail = 1 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_rhkly"] [resource] -default_font = ExtResource("2_j8kea") +default_font = ExtResource("40_bmcvq") Button/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) Button/colors/font_disabled_color = Color(0.227451, 0.172549, 0.290196, 1) Button/colors/font_focus_color = Color(0.941176, 0.964706, 0.909804, 1) @@ -85,11 +85,11 @@ Button/colors/icon_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) Button/constants/h_separation = 8 Button/constants/outline_size = 0 Button/font_sizes/font_size = 32 -Button/styles/disabled = ExtResource("1_wt1wr") -Button/styles/focus = ExtResource("2_nf3et") -Button/styles/hover = ExtResource("2_h7pgg") -Button/styles/normal = ExtResource("1_re3m3") -Button/styles/pressed = ExtResource("4_de308") +Button/styles/disabled = ExtResource("1_n3up8") +Button/styles/focus = ExtResource("2_ukct7") +Button/styles/hover = ExtResource("3_ukadi") +Button/styles/normal = ExtResource("4_b2mp2") +Button/styles/pressed = ExtResource("5_6rmq1") CheckBox/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) CheckBox/colors/font_disabled_color = Color(0.875, 0.875, 0.875, 0.5) CheckBox/colors/font_focus_color = Color(0.941176, 0.964706, 0.909804, 1) @@ -100,40 +100,40 @@ CheckBox/colors/font_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) CheckBox/constants/check_v_offset = 0 CheckBox/constants/h_separation = 4 CheckBox/constants/outline_size = 0 -CheckBox/icons/checked = ExtResource("6_srlcu") -CheckBox/icons/unchecked = ExtResource("7_p4k8i") -CheckBox/styles/disabled = ExtResource("1_wt1wr") -CheckBox/styles/focus = ExtResource("2_nf3et") -CheckBox/styles/hover = ExtResource("2_h7pgg") -CheckBox/styles/hover_pressed = ExtResource("4_de308") -CheckBox/styles/normal = ExtResource("1_re3m3") -CheckBox/styles/pressed = ExtResource("4_de308") +CheckBox/icons/checked = ExtResource("6_re2fr") +CheckBox/icons/unchecked = ExtResource("7_as124") +CheckBox/styles/disabled = ExtResource("1_n3up8") +CheckBox/styles/focus = ExtResource("2_ukct7") +CheckBox/styles/hover = ExtResource("3_ukadi") +CheckBox/styles/hover_pressed = ExtResource("5_6rmq1") +CheckBox/styles/normal = ExtResource("4_b2mp2") +CheckBox/styles/pressed = ExtResource("5_6rmq1") CheckButton/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) CheckButton/colors/font_focus_color = Color(0.941176, 0.964706, 0.909804, 1) CheckButton/colors/font_hover_color = Color(0.941176, 0.964706, 0.909804, 1) CheckButton/colors/font_hover_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) CheckButton/colors/font_outline_color = Color(0.941176, 0.964706, 0.909804, 1) CheckButton/colors/font_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) -CheckButton/icons/checked = ExtResource("8_r3sw2") -CheckButton/icons/unchecked = ExtResource("9_iytk4") -CheckButton/styles/disabled = ExtResource("1_wt1wr") -CheckButton/styles/focus = ExtResource("2_nf3et") -CheckButton/styles/hover = ExtResource("2_h7pgg") -CheckButton/styles/hover_pressed = ExtResource("4_de308") -CheckButton/styles/normal = ExtResource("1_re3m3") -CheckButton/styles/pressed = ExtResource("4_de308") -HScrollBar/styles/grabber = ExtResource("6_vjj3k") -HScrollBar/styles/grabber_highlight = ExtResource("7_yv3p6") -HScrollBar/styles/grabber_pressed = ExtResource("8_dr3de") -HScrollBar/styles/scroll = ExtResource("9_lv5dx") -HScrollBar/styles/scroll_focus = ExtResource("10_npblq") -HSlider/icons/grabber = ExtResource("6_tsx7l") -HSlider/icons/grabber_disabled = ExtResource("7_m4hfs") -HSlider/icons/grabber_highlight = ExtResource("8_4qpd7") +CheckButton/icons/checked = ExtResource("8_g1dhe") +CheckButton/icons/unchecked = ExtResource("9_trcl3") +CheckButton/styles/disabled = ExtResource("1_n3up8") +CheckButton/styles/focus = ExtResource("2_ukct7") +CheckButton/styles/hover = ExtResource("3_ukadi") +CheckButton/styles/hover_pressed = ExtResource("5_6rmq1") +CheckButton/styles/normal = ExtResource("4_b2mp2") +CheckButton/styles/pressed = ExtResource("5_6rmq1") +HScrollBar/styles/grabber = ExtResource("10_cb1fp") +HScrollBar/styles/grabber_highlight = ExtResource("11_s21yb") +HScrollBar/styles/grabber_pressed = ExtResource("12_fd8p2") +HScrollBar/styles/scroll = ExtResource("13_s3ehx") +HScrollBar/styles/scroll_focus = ExtResource("14_fwmx8") +HSlider/icons/grabber = ExtResource("15_ocljk") +HSlider/icons/grabber_disabled = ExtResource("16_rbxnn") +HSlider/icons/grabber_highlight = ExtResource("17_8a3cc") HSlider/icons/tick = SubResource("ImageTexture_g5bup") -HSlider/styles/grabber_area = ExtResource("14_b0thp") -HSlider/styles/grabber_area_highlight = ExtResource("14_b0thp") -HSlider/styles/slider = ExtResource("15_4oqlg") +HSlider/styles/grabber_area = ExtResource("18_fueyy") +HSlider/styles/grabber_area_highlight = ExtResource("18_fueyy") +HSlider/styles/slider = ExtResource("19_ccnyp") Label/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) Label/colors/font_outline_color = Color(0.745098, 0.760784, 0.721569, 1) Label/colors/font_shadow_color = Color(0.745098, 0.760784, 0.721569, 1) @@ -151,57 +151,57 @@ LineEdit/colors/font_uneditable_color = Color(0.745098, 0.760784, 0.721569, 1) LineEdit/colors/selection_color = Color(0.745098, 0.760784, 0.721569, 1) LineEdit/font_sizes/font_size = 24 LineEdit/styles/focus = SubResource("StyleBoxEmpty_jl30t") -LineEdit/styles/normal = ExtResource("6_lnycp") -LineEdit/styles/read_only = ExtResource("7_k2jlw") +LineEdit/styles/normal = ExtResource("20_1xrl8") +LineEdit/styles/read_only = ExtResource("21_1jd57") MenuButton/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) MenuButton/colors/font_focus_color = Color(0.941176, 0.964706, 0.909804, 1) MenuButton/colors/font_hover_color = Color(0.941176, 0.964706, 0.909804, 1) MenuButton/colors/font_outline_color = Color(0.941176, 0.964706, 0.909804, 1) MenuButton/colors/font_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) -MenuButton/styles/disabled = ExtResource("1_wt1wr") -MenuButton/styles/focus = ExtResource("2_nf3et") -MenuButton/styles/hover = ExtResource("2_h7pgg") -MenuButton/styles/normal = ExtResource("1_re3m3") -MenuButton/styles/pressed = ExtResource("4_de308") +MenuButton/styles/disabled = ExtResource("1_n3up8") +MenuButton/styles/focus = ExtResource("2_ukct7") +MenuButton/styles/hover = ExtResource("3_ukadi") +MenuButton/styles/normal = ExtResource("4_b2mp2") +MenuButton/styles/pressed = ExtResource("5_6rmq1") OptionButton/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) OptionButton/colors/font_focus_color = Color(0.941176, 0.964706, 0.909804, 1) OptionButton/colors/font_hover_color = Color(0.941176, 0.964706, 0.909804, 1) OptionButton/colors/font_hover_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) OptionButton/colors/font_outline_color = Color(0.941176, 0.964706, 0.909804, 1) OptionButton/colors/font_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) -OptionButton/icons/arrow = ExtResource("18_jqhuv") +OptionButton/icons/arrow = ExtResource("22_qar1e") Panel/styles/panel = SubResource("StyleBoxFlat_v2px0") ProgressBar/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) ProgressBar/font_sizes/font_size = 16 -ProgressBar/styles/background = ExtResource("18_ymgal") -ProgressBar/styles/fill = ExtResource("19_1x1m2") +ProgressBar/styles/background = ExtResource("23_r3p5f") +ProgressBar/styles/fill = ExtResource("24_twflh") TabContainer/colors/font_selected_color = Color(0.941176, 0.964706, 0.909804, 1) TabContainer/colors/font_unselected_color = Color(0.941176, 0.964706, 0.909804, 1) TabContainer/font_sizes/font_size = 16 -TabContainer/icons/decrement = ExtResource("20_skg1s") -TabContainer/icons/decrement_highlight = ExtResource("21_ivr4w") -TabContainer/icons/increment = ExtResource("22_tbsa0") -TabContainer/icons/increment_highlight = ExtResource("23_meyle") -TabContainer/styles/panel = ExtResource("24_ypm5h") -TabContainer/styles/tab_disabled = ExtResource("25_2cr8y") -TabContainer/styles/tab_selected = ExtResource("25_ou2yk") -TabContainer/styles/tab_unselected = ExtResource("26_pgono") +TabContainer/icons/decrement = ExtResource("25_tp1la") +TabContainer/icons/decrement_highlight = ExtResource("26_b6do7") +TabContainer/icons/increment = ExtResource("27_apyeg") +TabContainer/icons/increment_highlight = ExtResource("28_h4oun") +TabContainer/styles/panel = ExtResource("29_uo2g8") +TabContainer/styles/tab_disabled = ExtResource("30_e041s") +TabContainer/styles/tab_selected = ExtResource("31_0n7gu") +TabContainer/styles/tab_unselected = ExtResource("32_a2a8b") TextEdit/colors/caret_color = Color(0.168627, 0.662745, 0.705882, 1) TextEdit/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) TextEdit/colors/font_selected_color = Color(0.168627, 0.662745, 0.705882, 1) TextEdit/colors/selection_color = Color(0.745098, 0.760784, 0.721569, 1) TextEdit/font_sizes/font_size = 24 TextEdit/styles/focus = SubResource("StyleBoxEmpty_rhkly") -TextEdit/styles/normal = ExtResource("6_lnycp") -TextEdit/styles/read_only = ExtResource("7_k2jlw") -VScrollBar/styles/grabber = ExtResource("20_uo4of") -VScrollBar/styles/grabber_highlight = ExtResource("21_pjklk") -VScrollBar/styles/grabber_pressed = ExtResource("22_rcema") -VScrollBar/styles/scroll = ExtResource("23_1wjoi") -VScrollBar/styles/scroll_focus = ExtResource("24_64ah6") -VSlider/icons/grabber = ExtResource("6_tsx7l") -VSlider/icons/grabber_disabled = ExtResource("7_m4hfs") -VSlider/icons/grabber_highlight = ExtResource("8_4qpd7") -VSlider/styles/grabber_area = ExtResource("25_pdk86") -VSlider/styles/grabber_area_highlight = ExtResource("25_pdk86") -VSlider/styles/slider = ExtResource("26_1odpk") +TextEdit/styles/normal = ExtResource("20_1xrl8") +TextEdit/styles/read_only = ExtResource("21_1jd57") +VScrollBar/styles/grabber = ExtResource("33_wjjme") +VScrollBar/styles/grabber_highlight = ExtResource("34_y2stj") +VScrollBar/styles/grabber_pressed = ExtResource("35_q0217") +VScrollBar/styles/scroll = ExtResource("36_bu6rt") +VScrollBar/styles/scroll_focus = ExtResource("37_yr206") +VSlider/icons/grabber = ExtResource("15_ocljk") +VSlider/icons/grabber_disabled = ExtResource("16_rbxnn") +VSlider/icons/grabber_highlight = ExtResource("17_8a3cc") +VSlider/styles/grabber_area = ExtResource("38_wuc1e") +VSlider/styles/grabber_area_highlight = ExtResource("38_wuc1e") +VSlider/styles/slider = ExtResource("39_dl1e4") diff --git a/Assets/UI_Theme.tres b/Assets/UI_Theme.tres deleted file mode 100644 index b6ea9a3..0000000 --- a/Assets/UI_Theme.tres +++ /dev/null @@ -1,109 +0,0 @@ -[gd_resource type="Theme" load_steps=13 format=3 uid="uid://o3vg845para"] - -[ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="1_43hgj"] - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rmi2t"] -bg_color = Color(0.427451, 0.423529, 0.8, 1) -border_width_left = 4 -border_width_top = 4 -border_width_right = 4 -border_width_bottom = 4 -border_color = Color(0, 0, 0, 1) -expand_margin_left = 7.0 -expand_margin_right = 7.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_47cud"] -bg_color = Color(0.427451, 0.423529, 0.8, 1) -border_width_left = 4 -border_width_bottom = 4 -border_color = Color(0.317647, 0.301961, 0.658824, 1) -corner_radius_top_left = 2 -corner_radius_bottom_right = 2 -expand_margin_left = 7.0 -expand_margin_right = 7.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2i81h"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) -border_width_left = 4 -border_width_bottom = 4 -border_color = Color(0.262745, 0.243137, 0.556863, 1) -corner_radius_top_left = 2 -corner_radius_bottom_right = 2 -expand_margin_left = 10.0 -expand_margin_right = 10.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_vel2s"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) -expand_margin_left = 7.0 -expand_margin_right = 7.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7k6ml"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) -expand_margin_right = 10.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_11k4d"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_nyi0q"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_qky0m"] -bg_color = Color(0.313726, 0.231373, 0.4, 1) -border_width_left = 4 -border_width_top = 4 -border_width_right = 4 -border_width_bottom = 4 -border_color = Color(0.313726, 0.231373, 0.4, 1) -corner_radius_top_left = 2 -corner_radius_top_right = 2 -corner_radius_bottom_right = 2 -corner_radius_bottom_left = 2 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lleuj"] -bg_color = Color(0.941176, 0.964706, 0.909804, 1) -border_width_left = 5 -border_width_top = 5 -border_width_right = 5 -border_width_bottom = 5 -border_color = Color(0.65098, 0.741176, 0.509804, 1) -corner_radius_top_left = 5 -corner_radius_top_right = 5 -corner_radius_bottom_right = 5 -corner_radius_bottom_left = 5 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rcukk"] -bg_color = Color(0.941176, 0.964706, 0.909804, 1) -border_width_left = 3 -border_width_top = 3 -border_width_right = 3 -border_color = Color(0.658824, 0.74902, 0.517647, 1) -expand_margin_left = 5.0 -expand_margin_top = 5.0 -expand_margin_right = 5.0 -expand_margin_bottom = 5.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_44exv"] -bg_color = Color(0.894118, 0.94902, 0.835294, 1) -border_width_left = 4 -border_width_top = 4 -border_width_right = 4 -border_color = Color(0.635294, 0.756863, 0.482353, 1) -expand_margin_left = 4.0 -expand_margin_top = 4.0 -expand_margin_right = 4.0 - -[resource] -default_font = ExtResource("1_43hgj") -Button/styles/focus = SubResource("StyleBoxFlat_rmi2t") -Button/styles/hover = SubResource("StyleBoxFlat_47cud") -Button/styles/normal = SubResource("StyleBoxFlat_2i81h") -Button/styles/pressed = SubResource("StyleBoxFlat_vel2s") -CheckButton/styles/hover_pressed = SubResource("StyleBoxFlat_7k6ml") -HSlider/styles/grabber_area = SubResource("StyleBoxFlat_11k4d") -HSlider/styles/grabber_area_highlight = SubResource("StyleBoxFlat_nyi0q") -HSlider/styles/slider = SubResource("StyleBoxFlat_qky0m") -TabContainer/colors/font_selected_color = Color(0.0980392, 0.0980392, 0.0980392, 1) -TabContainer/colors/font_unselected_color = Color(0.435294, 0.435294, 0.435294, 1) -TabContainer/styles/panel = SubResource("StyleBoxFlat_lleuj") -TabContainer/styles/tab_selected = SubResource("StyleBoxFlat_rcukk") -TabContainer/styles/tab_unselected = SubResource("StyleBoxFlat_44exv") diff --git a/Prefabs/Settings Menu.tscn b/Prefabs/Settings Menu.tscn index e827acc..463ba22 100644 --- a/Prefabs/Settings Menu.tscn +++ b/Prefabs/Settings Menu.tscn @@ -1,59 +1,62 @@ -[gd_scene load_steps=4 format=3 uid="uid://cbfcolm6mjolp"] +[gd_scene load_steps=5 format=3 uid="uid://cbfcolm6mjolp"] [ext_resource type="Script" path="res://Scripts/UI/SettingsMenu.gd" id="1_2rgd2"] [ext_resource type="Script" path="res://Scripts/UI/Remaping/RemapController.gd" id="2_2f8ap"] [ext_resource type="Script" path="res://Scripts/UI/Remaping/RemapButton.gd" id="2_4asaa"] +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_02uod"] +bg_color = Color(0.439216, 0.631373, 0.537255, 1) + [node name="SettingsMenu" type="Node" node_paths=PackedStringArray("back_button", "tab_container", "bottom_item_video", "bottom_item_audio", "bottom_item_controls", "display_options_button", "vsync_toggle", "resolutions_options_button", "master_volume_slider", "music_volume_slider", "sfx_volume_slider")] script = ExtResource("1_2rgd2") back_button = NodePath("Back Button") -tab_container = NodePath("CenterContainer/SettingsTabs") -bottom_item_video = NodePath("CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/ResolutionsOptions") -bottom_item_audio = NodePath("CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/SFXVolSlider") -bottom_item_controls = NodePath("CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveRightRemapButton") -display_options_button = NodePath("CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/DisplayModeOptions") -vsync_toggle = NodePath("CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/VsyncButton") -resolutions_options_button = NodePath("CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/ResolutionsOptions") -master_volume_slider = NodePath("CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MasterVolumeSlider") -music_volume_slider = NodePath("CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MusicVolSlider") -sfx_volume_slider = NodePath("CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/SFXVolSlider") +tab_container = NodePath("SettingsTabs") +bottom_item_video = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/ResolutionsOptions") +bottom_item_audio = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider") +bottom_item_controls = NodePath("SettingsTabs/Controls/MarginContainer/GridContainer/MoveRightRemapButton") +display_options_button = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/DisplayModeOptions") +vsync_toggle = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/VsyncButton") +resolutions_options_button = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/ResolutionsOptions") +master_volume_slider = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/MasterVolumeSlider") +music_volume_slider = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/MusicVolSlider") +sfx_volume_slider = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider") -[node name="ColorRect" type="ColorRect" parent="."] +[node name="Remap Controller" type="Control" parent="."] +visible = false +layout_mode = 3 +anchors_preset = 0 +offset_left = 12.0 +offset_top = 12.0 +offset_right = 12.0 +offset_bottom = 12.0 +script = ExtResource("2_2f8ap") + +[node name="Panel" type="Panel" parent="."] anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -color = Color(0.576471, 0.831373, 0.709804, 1) +theme_override_styles/panel = SubResource("StyleBoxFlat_02uod") -[node name="Label" type="Label" parent="."] -anchors_preset = 10 -anchor_right = 1.0 -offset_bottom = 95.0 -grow_horizontal = 2 -theme_override_font_sizes/font_size = 35 -text = "SETTINGS MENU" -horizontal_alignment = 1 -vertical_alignment = 1 - -[node name="CenterContainer" type="CenterContainer" parent="."] -custom_minimum_size = Vector2(0, 475) -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="SettingsTabs" type="TabContainer" parent="CenterContainer"] +[node name="SettingsTabs" type="TabContainer" parent="."] custom_minimum_size = Vector2(1050, 475) -layout_mode = 2 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 12.0 +offset_top = 12.0 +offset_right = -12.0 +offset_bottom = -109.0 +grow_horizontal = 2 +grow_vertical = 2 theme_override_font_sizes/font_size = 29 -[node name="Video" type="VBoxContainer" parent="CenterContainer/SettingsTabs"] +[node name="Video" type="VBoxContainer" parent="SettingsTabs"] layout_mode = 2 focus_neighbor_left = NodePath("../Controls") -[node name="MarginContainer" type="MarginContainer" parent="CenterContainer/SettingsTabs/Video"] +[node name="MarginContainer" type="MarginContainer" parent="SettingsTabs/Video"] custom_minimum_size = Vector2(0, 425) layout_mode = 2 theme_override_constants/margin_left = 25 @@ -61,22 +64,19 @@ theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="VideoSettings" type="GridContainer" parent="CenterContainer/SettingsTabs/Video/MarginContainer"] +[node name="GridContainer" type="GridContainer" parent="SettingsTabs/Video/MarginContainer"] layout_mode = 2 columns = 2 -[node name="DisplayModeLabel" type="Label" parent="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings"] +[node name="DisplayModeLabel" type="Label" parent="SettingsTabs/Video/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "Display Mode" vertical_alignment = 1 -[node name="DisplayModeOptions" type="OptionButton" parent="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings"] -custom_minimum_size = Vector2(500, 40) +[node name="DisplayModeOptions" type="OptionButton" parent="SettingsTabs/Video/MarginContainer/GridContainer"] layout_mode = 2 -size_flags_horizontal = 10 +size_flags_horizontal = 3 item_count = 5 selected = 0 popup/item_0/text = "Full-Screen" @@ -90,42 +90,36 @@ popup/item_3/id = 3 popup/item_4/text = "Exclusive Full-Screen" popup/item_4/id = 4 -[node name="VSync Label" type="Label" parent="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings"] +[node name="VSync Label" type="Label" parent="SettingsTabs/Video/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "VSync " vertical_alignment = 1 -[node name="VsyncButton" type="CheckButton" parent="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings"] -custom_minimum_size = Vector2(500, 40) +[node name="VsyncButton" type="CheckButton" parent="SettingsTabs/Video/MarginContainer/GridContainer"] layout_mode = 2 -size_flags_horizontal = 10 +size_flags_horizontal = 3 text = "Vsync" -[node name="ResolutionsLabel" type="Label" parent="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings"] +[node name="ResolutionsLabel" type="Label" parent="SettingsTabs/Video/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "Resolutions " vertical_alignment = 1 -[node name="ResolutionsOptions" type="OptionButton" parent="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings"] -custom_minimum_size = Vector2(500, 40) +[node name="ResolutionsOptions" type="OptionButton" parent="SettingsTabs/Video/MarginContainer/GridContainer"] layout_mode = 2 -size_flags_horizontal = 10 -focus_neighbor_bottom = NodePath("../../../../../../Back Button") +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../Back Button") fit_to_longest_item = false -[node name="Audio" type="VBoxContainer" parent="CenterContainer/SettingsTabs"] +[node name="Audio" type="VBoxContainer" parent="SettingsTabs"] visible = false layout_mode = 2 -[node name="MarginContainer" type="MarginContainer" parent="CenterContainer/SettingsTabs/Audio"] +[node name="MarginContainer" type="MarginContainer" parent="SettingsTabs/Audio"] custom_minimum_size = Vector2(0, 425) layout_mode = 2 theme_override_constants/margin_left = 25 @@ -133,67 +127,55 @@ theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="AudioSettings" type="GridContainer" parent="CenterContainer/SettingsTabs/Audio/MarginContainer"] +[node name="GridContainer" type="GridContainer" parent="SettingsTabs/Audio/MarginContainer"] layout_mode = 2 columns = 2 -[node name="MasterVolLabel" type="Label" parent="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings"] +[node name="MasterVolLabel" type="Label" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "Master Volume " vertical_alignment = 1 -[node name="MasterVolumeSlider" type="HSlider" parent="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings"] -custom_minimum_size = Vector2(500, 40) +[node name="MasterVolumeSlider" type="HSlider" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] layout_mode = 2 -size_flags_horizontal = 10 +size_flags_horizontal = 3 min_value = -72.0 max_value = 0.0 -[node name="MusicVolLabel" type="Label" parent="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings"] +[node name="MusicVolLabel" type="Label" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "Music Volume " vertical_alignment = 1 -[node name="MusicVolSlider" type="HSlider" parent="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings"] -custom_minimum_size = Vector2(500, 40) +[node name="MusicVolSlider" type="HSlider" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] layout_mode = 2 -size_flags_horizontal = 10 +size_flags_horizontal = 3 min_value = -72.0 max_value = 0.0 -[node name="SFXVolLabel" type="Label" parent="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings"] +[node name="SFXVolLabel" type="Label" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "SFX Volume" vertical_alignment = 1 -[node name="SFXVolSlider" type="HSlider" parent="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings"] +[node name="SFXVolSlider" type="HSlider" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] custom_minimum_size = Vector2(500, 40) layout_mode = 2 -size_flags_horizontal = 10 -focus_neighbor_bottom = NodePath("../../../../../../Back Button") +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../Back Button") min_value = -72.0 max_value = 0.0 -[node name="Controls" type="VBoxContainer" parent="CenterContainer/SettingsTabs"] +[node name="Controls" type="VBoxContainer" parent="SettingsTabs"] visible = false layout_mode = 2 -[node name="Remap Controller" type="Control" parent="CenterContainer/SettingsTabs/Controls"] -layout_mode = 2 -script = ExtResource("2_2f8ap") - -[node name="MarginContainer" type="MarginContainer" parent="CenterContainer/SettingsTabs/Controls"] +[node name="MarginContainer" type="MarginContainer" parent="SettingsTabs/Controls"] custom_minimum_size = Vector2(0, 425) layout_mode = 2 theme_override_constants/margin_left = 25 @@ -201,78 +183,65 @@ theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="ControlSettings" type="GridContainer" parent="CenterContainer/SettingsTabs/Controls/MarginContainer"] +[node name="GridContainer" type="GridContainer" parent="SettingsTabs/Controls/MarginContainer"] layout_mode = 2 columns = 2 -[node name="MoveUpLabel" type="Label" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings"] +[node name="MoveUpLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "Move Up" vertical_alignment = 1 -[node name="MoveUpRemapButton" type="Button" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings" node_paths=PackedStringArray("remap_controller")] -custom_minimum_size = Vector2(500, 40) +[node name="MoveUpRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 -size_flags_horizontal = 10 toggle_mode = true script = ExtResource("2_4asaa") input_action_name = "move_up" -remap_controller = NodePath("../../../Remap Controller") +remap_controller = NodePath("../../../../../Remap Controller") -[node name="MoveLeftLabel" type="Label" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings"] +[node name="MoveLeftLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "Move Left" vertical_alignment = 1 -[node name="MoveLeftRemapButton" type="Button" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings" node_paths=PackedStringArray("remap_controller")] -custom_minimum_size = Vector2(500, 40) +[node name="MoveLeftRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 -size_flags_horizontal = 10 +size_flags_horizontal = 3 toggle_mode = true script = ExtResource("2_4asaa") input_action_name = "move_left" -remap_controller = NodePath("../../../Remap Controller") +remap_controller = NodePath("../../../../../Remap Controller") -[node name="MoveDownLabel" type="Label" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings"] +[node name="MoveDownLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "Move Down" vertical_alignment = 1 -[node name="MoveDownRemapButton" type="Button" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings" node_paths=PackedStringArray("remap_controller")] -custom_minimum_size = Vector2(500, 40) +[node name="MoveDownRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 -size_flags_horizontal = 10 +size_flags_horizontal = 3 toggle_mode = true script = ExtResource("2_4asaa") input_action_name = "move_down" -remap_controller = NodePath("../../../Remap Controller") +remap_controller = NodePath("../../../../../Remap Controller") -[node name="MoveRightLabel" type="Label" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings"] +[node name="MoveRightLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "Move RIght" vertical_alignment = 1 -[node name="MoveRightRemapButton" type="Button" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings" node_paths=PackedStringArray("remap_controller")] -custom_minimum_size = Vector2(500, 40) +[node name="MoveRightRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 -size_flags_horizontal = 10 -focus_neighbor_bottom = NodePath("../../../../../../Back Button") +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../Back Button") toggle_mode = true script = ExtResource("2_4asaa") input_action_name = "move_right" -remap_controller = NodePath("../../../Remap Controller") +remap_controller = NodePath("../../../../../Remap Controller") [node name="Back Button" type="Button" parent="."] custom_minimum_size = Vector2(500, 40) @@ -290,17 +259,17 @@ grow_vertical = 0 theme_override_font_sizes/font_size = 23 text = "Back" -[connection signal="item_selected" from="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/DisplayModeOptions" to="." method="_on_display_mode_options_item_selected"] -[connection signal="toggled" from="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/VsyncButton" to="." method="_on_vsync_button_toggled"] -[connection signal="item_selected" from="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/ResolutionsOptions" to="." method="_on_resolutions_options_item_selected"] -[connection signal="drag_ended" from="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MasterVolumeSlider" to="." method="_on_master_volume_slider_drag_ended"] -[connection signal="value_changed" from="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MasterVolumeSlider" to="." method="_on_master_volume_slider_value_changed"] -[connection signal="drag_ended" from="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MusicVolSlider" to="." method="_on_music_vol_slider_drag_ended"] -[connection signal="value_changed" from="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MusicVolSlider" to="." method="_on_music_vol_slider_value_changed"] -[connection signal="drag_ended" from="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/SFXVolSlider" to="." method="_on_sfx_vol_slider_drag_ended"] -[connection signal="value_changed" from="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/SFXVolSlider" to="." method="_on_sfx_vol_slider_value_changed"] -[connection signal="pressed" from="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveUpRemapButton" to="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveUpRemapButton" method="_on_pressed"] -[connection signal="pressed" from="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveLeftRemapButton" to="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveLeftRemapButton" method="_on_pressed"] -[connection signal="pressed" from="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveDownRemapButton" to="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveDownRemapButton" method="_on_pressed"] -[connection signal="pressed" from="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveRightRemapButton" to="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveRightRemapButton" method="_on_pressed"] +[connection signal="item_selected" from="SettingsTabs/Video/MarginContainer/GridContainer/DisplayModeOptions" to="." method="_on_display_mode_options_item_selected"] +[connection signal="toggled" from="SettingsTabs/Video/MarginContainer/GridContainer/VsyncButton" to="." method="_on_vsync_button_toggled"] +[connection signal="item_selected" from="SettingsTabs/Video/MarginContainer/GridContainer/ResolutionsOptions" to="." method="_on_resolutions_options_item_selected"] +[connection signal="drag_ended" from="SettingsTabs/Audio/MarginContainer/GridContainer/MasterVolumeSlider" to="." method="_on_master_volume_slider_drag_ended"] +[connection signal="value_changed" from="SettingsTabs/Audio/MarginContainer/GridContainer/MasterVolumeSlider" to="." method="_on_master_volume_slider_value_changed"] +[connection signal="drag_ended" from="SettingsTabs/Audio/MarginContainer/GridContainer/MusicVolSlider" to="." method="_on_music_vol_slider_drag_ended"] +[connection signal="value_changed" from="SettingsTabs/Audio/MarginContainer/GridContainer/MusicVolSlider" to="." method="_on_music_vol_slider_value_changed"] +[connection signal="drag_ended" from="SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider" to="." method="_on_sfx_vol_slider_drag_ended"] +[connection signal="value_changed" from="SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider" to="." method="_on_sfx_vol_slider_value_changed"] +[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveUpRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveUpRemapButton" method="_on_pressed"] +[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveLeftRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveLeftRemapButton" method="_on_pressed"] +[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveDownRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveDownRemapButton" method="_on_pressed"] +[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveRightRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveRightRemapButton" method="_on_pressed"] [connection signal="pressed" from="Back Button" to="." method="_on_back_pressed"] diff --git a/Scenes/Main Menu.tscn b/Scenes/Main Menu.tscn index a38e2fd..0c7bb4f 100644 --- a/Scenes/Main Menu.tscn +++ b/Scenes/Main Menu.tscn @@ -1,18 +1,125 @@ -[gd_scene load_steps=14 format=3 uid="uid://4fysk8vaw3e1"] +[gd_scene load_steps=25 format=3 uid="uid://cukyb513fah1u"] [ext_resource type="Script" path="res://Scripts/UI/MainMenuManager.gd" id="1_qepq0"] [ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png" id="2_8o6th"] [ext_resource type="PackedScene" uid="uid://c4btepmue6d7p" path="res://Scenes/Game.tscn" id="2_28004"] [ext_resource type="Texture2D" uid="uid://daat37cyg0go5" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png" id="3_1e3fe"] [ext_resource type="PackedScene" uid="uid://cbfcolm6mjolp" path="res://Prefabs/Settings Menu.tscn" id="3_r3r61"] -[ext_resource type="Texture2D" uid="uid://dhvvw4yckl8x7" path="res://Assets/Sprites/Start Menu Old/Cake.png" id="5_7ull8"] +[ext_resource type="Theme" uid="uid://babphdknr2kkd" path="res://Assets/UI/Theme.tres" id="4_bmt8e"] [ext_resource type="Texture2D" uid="uid://c3yg6u8yncau3" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png" id="6_45o7d"] -[ext_resource type="Texture2D" uid="uid://cp84ssaqs3pmp" path="res://Assets/Sprites/Start Menu Old/Jesus.png" id="6_wnx18"] [ext_resource type="Texture2D" uid="uid://dkotcqflp3e32" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png" id="7_285vd"] -[ext_resource type="Theme" uid="uid://o3vg845para" path="res://Assets/UI_Theme.tres" id="8_lr748"] -[ext_resource type="Script" path="res://Scripts/UI/MenuButton.gd" id="9_2cu5l"] -[ext_resource type="Texture2D" uid="uid://6snf183fgfo5" path="res://Assets/Sprites/Start Menu Old/Cross.png" id="12_dhfc0"] -[ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/Temp Music/omw-to-beat-the-big-bad.wav" id="13_3j724"] +[ext_resource type="Texture2D" uid="uid://ojlfqxj5bilo" path="res://Assets/Sprites/Jesus/jesus_spritesheet.png" id="7_g28i1"] +[ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="10_seibg"] +[ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/Music/omw-to-beat-the-big-bad.wav" id="12_i62fw"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5uvie"] +bg_color = Color(0.439216, 0.631373, 0.537255, 1) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rmi2t"] +bg_color = Color(0.427451, 0.423529, 0.8, 1) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_width_bottom = 4 +border_color = Color(0, 0, 0, 1) +expand_margin_left = 7.0 +expand_margin_right = 7.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_47cud"] +bg_color = Color(0.427451, 0.423529, 0.8, 1) +border_width_left = 4 +border_width_bottom = 4 +border_color = Color(0.317647, 0.301961, 0.658824, 1) +corner_radius_top_left = 2 +corner_radius_bottom_right = 2 +expand_margin_left = 7.0 +expand_margin_right = 7.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2i81h"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) +border_width_left = 4 +border_width_bottom = 4 +border_color = Color(0.262745, 0.243137, 0.556863, 1) +corner_radius_top_left = 2 +corner_radius_bottom_right = 2 +expand_margin_left = 10.0 +expand_margin_right = 10.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_vel2s"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) +expand_margin_left = 7.0 +expand_margin_right = 7.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7k6ml"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) +expand_margin_right = 10.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_11k4d"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_nyi0q"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_qky0m"] +bg_color = Color(0.313726, 0.231373, 0.4, 1) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_width_bottom = 4 +border_color = Color(0.313726, 0.231373, 0.4, 1) +corner_radius_top_left = 2 +corner_radius_top_right = 2 +corner_radius_bottom_right = 2 +corner_radius_bottom_left = 2 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lleuj"] +bg_color = Color(0.941176, 0.964706, 0.909804, 1) +border_width_left = 5 +border_width_top = 5 +border_width_right = 5 +border_width_bottom = 5 +border_color = Color(0.65098, 0.741176, 0.509804, 1) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rcukk"] +bg_color = Color(0.941176, 0.964706, 0.909804, 1) +border_width_left = 3 +border_width_top = 3 +border_width_right = 3 +border_color = Color(0.658824, 0.74902, 0.517647, 1) +expand_margin_left = 5.0 +expand_margin_top = 5.0 +expand_margin_right = 5.0 +expand_margin_bottom = 5.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_44exv"] +bg_color = Color(0.894118, 0.94902, 0.835294, 1) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_color = Color(0.635294, 0.756863, 0.482353, 1) +expand_margin_left = 4.0 +expand_margin_top = 4.0 +expand_margin_right = 4.0 + +[sub_resource type="Theme" id="Theme_w723v"] +default_font = ExtResource("10_seibg") +Button/styles/focus = SubResource("StyleBoxFlat_rmi2t") +Button/styles/hover = SubResource("StyleBoxFlat_47cud") +Button/styles/normal = SubResource("StyleBoxFlat_2i81h") +Button/styles/pressed = SubResource("StyleBoxFlat_vel2s") +CheckButton/styles/hover_pressed = SubResource("StyleBoxFlat_7k6ml") +HSlider/styles/grabber_area = SubResource("StyleBoxFlat_11k4d") +HSlider/styles/grabber_area_highlight = SubResource("StyleBoxFlat_nyi0q") +HSlider/styles/slider = SubResource("StyleBoxFlat_qky0m") +TabContainer/colors/font_selected_color = Color(0.0980392, 0.0980392, 0.0980392, 1) +TabContainer/colors/font_unselected_color = Color(0.435294, 0.435294, 0.435294, 1) +TabContainer/styles/panel = SubResource("StyleBoxFlat_lleuj") +TabContainer/styles/tab_selected = SubResource("StyleBoxFlat_rcukk") +TabContainer/styles/tab_unselected = SubResource("StyleBoxFlat_44exv") [node name="MainMenu" type="Node" node_paths=PackedStringArray("default_focus")] script = ExtResource("1_qepq0") @@ -20,13 +127,14 @@ game_scene = ExtResource("2_28004") settings_scene = ExtResource("3_r3r61") default_focus = NodePath("MainVBox/ButtonsVbox/PlayButton") -[node name="ColorRect" type="ColorRect" parent="."] +[node name="ColorRect" type="Panel" parent="."] anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -color = Color(0.576471, 0.831373, 0.709804, 1) +theme = ExtResource("4_bmt8e") +theme_override_styles/panel = SubResource("StyleBoxFlat_5uvie") [node name="Decorations" type="Control" parent="."] layout_mode = 3 @@ -48,21 +156,18 @@ position = Vector2(226.563, 338.875) scale = Vector2(22.7773, 15.6953) texture = ExtResource("2_8o6th") +[node name="Jesus" type="Sprite2D" parent="Decorations/Left Decor"] +position = Vector2(231.625, 327.793) +scale = Vector2(8.16379, 8.16379) +texture = ExtResource("7_g28i1") +hframes = 8 +vframes = 4 + [node name="Egg3" type="Sprite2D" parent="Decorations/Left Decor"] -position = Vector2(134, 477) +position = Vector2(132, 530) scale = Vector2(4.6875, 4.625) texture = ExtResource("3_1e3fe") -[node name="Jesus" type="Sprite2D" parent="Decorations/Left Decor"] -position = Vector2(220, 335) -scale = Vector2(7.0431, 6.97321) -texture = ExtResource("6_wnx18") - -[node name="Cake" type="Sprite2D" parent="Decorations/Left Decor"] -position = Vector2(310, 491) -scale = Vector2(2.59375, 2.32031) -texture = ExtResource("5_7ull8") - [node name="Right Decor" type="CenterContainer" parent="Decorations"] custom_minimum_size = Vector2(576, 0) layout_mode = 1 @@ -98,16 +203,19 @@ hframes = 6 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +offset_left = 31.0 +offset_top = 22.0 +offset_right = -31.0 +offset_bottom = -22.0 grow_horizontal = 2 grow_vertical = 2 -theme = ExtResource("8_lr748") +theme = SubResource("Theme_w723v") -[node name="CenterContainer" type="CenterContainer" parent="MainVBox"] -custom_minimum_size = Vector2(0, 150) -layout_mode = 2 - -[node name="Label" type="Label" parent="MainVBox/CenterContainer"] +[node name="Label" type="Label" parent="MainVBox"] layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 8 +theme = ExtResource("4_bmt8e") theme_override_font_sizes/font_size = 50 text = "HOPPY EASTER GAME THING" horizontal_alignment = 1 @@ -116,10 +224,13 @@ vertical_alignment = 1 [node name="ButtonsVbox" type="VBoxContainer" parent="MainVBox"] custom_minimum_size = Vector2(0, 495) layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 3 +theme = ExtResource("4_bmt8e") theme_override_constants/separation = 10 alignment = 1 -[node name="PlayButton" type="TextureButton" parent="MainVBox/ButtonsVbox" node_paths=PackedStringArray("leftPointer", "rightPointer", "textBox")] +[node name="PlayButton" type="Button" parent="MainVBox/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 focus_neighbor_left = NodePath("../QuitButton") @@ -128,39 +239,11 @@ focus_neighbor_right = NodePath("../SettingsButton") focus_neighbor_bottom = NodePath("../SettingsButton") focus_next = NodePath("../SettingsButton") focus_previous = NodePath("../QuitButton") -mouse_default_cursor_shape = 2 -script = ExtResource("9_2cu5l") +theme = ExtResource("4_bmt8e") +theme_override_font_sizes/font_size = 64 text = "Play" -pointer_margin_from_center = 80 -leftPointer = NodePath("LeftPointer") -rightPointer = NodePath("RightPointer") -textBox = NodePath("RichTextLabel") -[node name="RichTextLabel" type="RichTextLabel" parent="MainVBox/ButtonsVbox/PlayButton"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -theme_override_font_sizes/normal_font_size = 30 -bbcode_enabled = true -text = "[center]Play[/center]" - -[node name="LeftPointer" type="Sprite2D" parent="MainVBox/ButtonsVbox/PlayButton"] -visible = false -position = Vector2(502, 12) -rotation = 1.5708 -texture = ExtResource("12_dhfc0") - -[node name="RightPointer" type="Sprite2D" parent="MainVBox/ButtonsVbox/PlayButton"] -visible = false -position = Vector2(650, 12) -rotation = -1.5708 -texture = ExtResource("12_dhfc0") - -[node name="SettingsButton" type="TextureButton" parent="MainVBox/ButtonsVbox" node_paths=PackedStringArray("leftPointer", "rightPointer", "textBox")] +[node name="SettingsButton" type="Button" parent="MainVBox/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 focus_neighbor_left = NodePath("../PlayButton") @@ -169,39 +252,11 @@ focus_neighbor_right = NodePath("../AboutButton") focus_neighbor_bottom = NodePath("../AboutButton") focus_next = NodePath("../AboutButton") focus_previous = NodePath("../PlayButton") -mouse_default_cursor_shape = 2 -script = ExtResource("9_2cu5l") +theme = ExtResource("4_bmt8e") +theme_override_font_sizes/font_size = 64 text = "Settings" -pointer_margin_from_center = 130 -leftPointer = NodePath("LeftPointer") -rightPointer = NodePath("RightPointer") -textBox = NodePath("RichTextLabel") -[node name="RichTextLabel" type="RichTextLabel" parent="MainVBox/ButtonsVbox/SettingsButton"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -theme_override_font_sizes/normal_font_size = 30 -bbcode_enabled = true -text = "[center]Settings[/center]" - -[node name="LeftPointer" type="Sprite2D" parent="MainVBox/ButtonsVbox/SettingsButton"] -visible = false -position = Vector2(502, 12) -rotation = 1.5708 -texture = ExtResource("12_dhfc0") - -[node name="RightPointer" type="Sprite2D" parent="MainVBox/ButtonsVbox/SettingsButton"] -visible = false -position = Vector2(650, 12) -rotation = -1.5708 -texture = ExtResource("12_dhfc0") - -[node name="AboutButton" type="TextureButton" parent="MainVBox/ButtonsVbox" node_paths=PackedStringArray("leftPointer", "rightPointer", "textBox")] +[node name="AboutButton" type="Button" parent="MainVBox/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 focus_neighbor_left = NodePath("../SettingsButton") @@ -210,39 +265,11 @@ focus_neighbor_right = NodePath("../QuitButton") focus_neighbor_bottom = NodePath("../QuitButton") focus_next = NodePath("../QuitButton") focus_previous = NodePath("../SettingsButton") -mouse_default_cursor_shape = 2 -script = ExtResource("9_2cu5l") +theme = ExtResource("4_bmt8e") +theme_override_font_sizes/font_size = 64 text = "About" -pointer_margin_from_center = 95 -leftPointer = NodePath("LeftPointer") -rightPointer = NodePath("RightPointer") -textBox = NodePath("RichTextLabel") -[node name="RichTextLabel" type="RichTextLabel" parent="MainVBox/ButtonsVbox/AboutButton"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -theme_override_font_sizes/normal_font_size = 30 -bbcode_enabled = true -text = "[center]About[/center]" - -[node name="LeftPointer" type="Sprite2D" parent="MainVBox/ButtonsVbox/AboutButton"] -visible = false -position = Vector2(502, 12) -rotation = 1.5708 -texture = ExtResource("12_dhfc0") - -[node name="RightPointer" type="Sprite2D" parent="MainVBox/ButtonsVbox/AboutButton"] -visible = false -position = Vector2(650, 12) -rotation = -1.5708 -texture = ExtResource("12_dhfc0") - -[node name="QuitButton" type="TextureButton" parent="MainVBox/ButtonsVbox" node_paths=PackedStringArray("leftPointer", "rightPointer", "textBox")] +[node name="QuitButton" type="Button" parent="MainVBox/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 focus_neighbor_left = NodePath("../AboutButton") @@ -251,40 +278,12 @@ focus_neighbor_right = NodePath("../PlayButton") focus_neighbor_bottom = NodePath("../PlayButton") focus_next = NodePath("../PlayButton") focus_previous = NodePath("../AboutButton") -mouse_default_cursor_shape = 2 -script = ExtResource("9_2cu5l") +theme = ExtResource("4_bmt8e") +theme_override_font_sizes/font_size = 64 text = "Quit" -pointer_margin_from_center = 80 -leftPointer = NodePath("LeftPointer") -rightPointer = NodePath("RightPointer") -textBox = NodePath("RichTextLabel") - -[node name="RichTextLabel" type="RichTextLabel" parent="MainVBox/ButtonsVbox/QuitButton"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -theme_override_font_sizes/normal_font_size = 30 -bbcode_enabled = true -text = "[center]Quit[/center]" - -[node name="LeftPointer" type="Sprite2D" parent="MainVBox/ButtonsVbox/QuitButton"] -visible = false -position = Vector2(502, 12) -rotation = 1.5708 -texture = ExtResource("12_dhfc0") - -[node name="RightPointer" type="Sprite2D" parent="MainVBox/ButtonsVbox/QuitButton"] -visible = false -position = Vector2(650, 12) -rotation = -1.5708 -texture = ExtResource("12_dhfc0") [node name="MusicPlayer" type="AudioStreamPlayer" parent="."] -stream = ExtResource("13_3j724") +stream = ExtResource("12_i62fw") autoplay = true bus = &"Music" diff --git a/Scenes/Main Menu.tscn.save b/Scenes/Main Menu.tscn.save new file mode 100644 index 0000000..f01e73c --- /dev/null +++ b/Scenes/Main Menu.tscn.save @@ -0,0 +1,282 @@ +[gd_scene load_steps=24 format=3 uid="uid://4fysk8vaw3e1"] + +[ext_resource type="Script" path="res://Scripts/UI/MainMenuManager.gd" id="1_qepq0"] +[ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png" id="2_8o6th"] +[ext_resource type="PackedScene" uid="uid://c4btepmue6d7p" path="res://Scenes/Game.tscn" id="2_28004"] +[ext_resource type="Texture2D" uid="uid://daat37cyg0go5" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png" id="3_1e3fe"] +[ext_resource type="PackedScene" uid="uid://cbfcolm6mjolp" path="res://Prefabs/Settings Menu.tscn" id="3_r3r61"] +[ext_resource type="Texture2D" uid="uid://dhvvw4yckl8x7" path="res://Assets/Sprites/Start Menu Old/Cake.png" id="5_7ull8"] +[ext_resource type="Texture2D" uid="uid://c3yg6u8yncau3" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png" id="6_45o7d"] +[ext_resource type="Texture2D" uid="uid://cp84ssaqs3pmp" path="res://Assets/Sprites/Start Menu Old/Jesus.png" id="6_wnx18"] +[ext_resource type="Texture2D" uid="uid://dkotcqflp3e32" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png" id="7_285vd"] +[ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="10_seibg"] +[ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/Temp Music/omw-to-beat-the-big-bad.wav" id="13_3j724"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rmi2t"] +bg_color = Color(0.427451, 0.423529, 0.8, 1) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_width_bottom = 4 +border_color = Color(0, 0, 0, 1) +expand_margin_left = 7.0 +expand_margin_right = 7.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_47cud"] +bg_color = Color(0.427451, 0.423529, 0.8, 1) +border_width_left = 4 +border_width_bottom = 4 +border_color = Color(0.317647, 0.301961, 0.658824, 1) +corner_radius_top_left = 2 +corner_radius_bottom_right = 2 +expand_margin_left = 7.0 +expand_margin_right = 7.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2i81h"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) +border_width_left = 4 +border_width_bottom = 4 +border_color = Color(0.262745, 0.243137, 0.556863, 1) +corner_radius_top_left = 2 +corner_radius_bottom_right = 2 +expand_margin_left = 10.0 +expand_margin_right = 10.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_vel2s"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) +expand_margin_left = 7.0 +expand_margin_right = 7.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7k6ml"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) +expand_margin_right = 10.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_11k4d"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_nyi0q"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_qky0m"] +bg_color = Color(0.313726, 0.231373, 0.4, 1) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_width_bottom = 4 +border_color = Color(0.313726, 0.231373, 0.4, 1) +corner_radius_top_left = 2 +corner_radius_top_right = 2 +corner_radius_bottom_right = 2 +corner_radius_bottom_left = 2 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lleuj"] +bg_color = Color(0.941176, 0.964706, 0.909804, 1) +border_width_left = 5 +border_width_top = 5 +border_width_right = 5 +border_width_bottom = 5 +border_color = Color(0.65098, 0.741176, 0.509804, 1) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rcukk"] +bg_color = Color(0.941176, 0.964706, 0.909804, 1) +border_width_left = 3 +border_width_top = 3 +border_width_right = 3 +border_color = Color(0.658824, 0.74902, 0.517647, 1) +expand_margin_left = 5.0 +expand_margin_top = 5.0 +expand_margin_right = 5.0 +expand_margin_bottom = 5.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_44exv"] +bg_color = Color(0.894118, 0.94902, 0.835294, 1) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_color = Color(0.635294, 0.756863, 0.482353, 1) +expand_margin_left = 4.0 +expand_margin_top = 4.0 +expand_margin_right = 4.0 + +[sub_resource type=" +Theme" id="Theme_w723v"] +default_font = ExtResource("10_seibg") +Button/styles/focus = SubResource("StyleBoxFlat_rmi2t") +Button/styles/hover = SubResource("StyleBoxFlat_47cud") +Button/styles/normal = SubResource("StyleBoxFlat_2i81h") +Button/styles/pressed = SubResource("StyleBoxFlat_vel2s") +CheckButton/styles/hover_pressed = SubResource("StyleBoxFlat_7k6ml") +HSlider/styles/grabber_area = SubResource("StyleBoxFlat_11k4d") +HSlider/styles/grabber_area_highlight = SubResource("StyleBoxFlat_nyi0q") +HSlider/styles/slider = SubResource("StyleBoxFlat_qky0m") +TabContainer/colors/font_selected_color = Color(0.0980392, 0.0980392, 0.0980392, 1) +TabContainer/colors/font_unselected_color = Color(0.435294, 0.435294, 0.435294, 1) +TabContainer/styles/panel = SubResource("StyleBoxFlat_lleuj") +TabContainer/styles/tab_selected = SubResource("StyleBoxFlat_rcukk") +TabContainer/styles/tab_unselected = SubResource("StyleBoxFlat_44exv") + +[node name="MainMenu" type="Node" node_paths=PackedStringArray("default_focus")] +script = ExtResource("1_qepq0") +game_scene = ExtResource("2_28004") +settings_scene = ExtResource("3_r3r61") +default_focus = NodePath("MainVBox/ButtonsVbox/PlayButton") + +[node name="ColorRect" type="Panel" parent="."] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="Decorations" type="Control" parent="."] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="Left Decor" type="CenterContainer" parent="Decorations"] +custom_minimum_size = Vector2(576, 0) +layout_mode = 1 +anchors_preset = 9 +anchor_bottom = 1.0 +grow_vertical = 2 + +[node name="Shadow" type="Sprite2D" parent="Decorations/Left Decor"] +position = Vector2(226.563, 338.875) +scale = Vector2(22.7773, 15.6953) +texture = ExtResource("2_8o6th") + +[node name="Egg3" type="Sprite2D" parent="Decorations/Left Decor"] +position = Vector2(134, 477) +scale = Vector2(4.6875, 4.625) +texture = ExtResource("3_1e3fe") + +[node name="Jesus" type="Sprite2D" parent="Decorations/Left Decor"] +position = Vector2(220, 335) +scale = Vector2(7.0431, 6.97321) +texture = ExtResource("6_wnx18") + +[node name="Cake" type="Sprite2D" parent="Decorations/Left Decor"] +position = Vector2(310, 491) +scale = Vector2(2.59375, 2.32031) +texture = ExtResource("5_7ull8") + +[node name="Right Decor" type="CenterContainer" parent="Decorations"] +custom_minimum_size = Vector2(576, 0) +layout_mode = 1 +anchors_preset = 11 +anchor_left = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 0 +grow_vertical = 2 + +[node name="Shadow2" type="Sprite2D" parent="Decorations/Right Decor"] +position = Vector2(351, 403) +scale = Vector2(19.0938, 11.8125) +texture = ExtResource("2_8o6th") + +[node name="Egg2" type="Sprite2D" parent="Decorations/Right Decor"] +position = Vector2(294, 487) +rotation = -1.5708 +scale = Vector2(4.89203, 5.21732) +texture = ExtResource("6_45o7d") + +[node name="Egg1" type="Sprite2D" parent="Decorations/Right Decor"] +position = Vector2(420.75, 471.25) +scale = Vector2(4.89062, 4.95313) +texture = ExtResource("7_285vd") + +[node name="GoodBunny" type="Sprite2D" parent="Decorations/Right Decor"] +position = Vector2(331, 458.5) +scale = Vector2(7.14286, 7.02941) +hframes = 6 + +[node name="MainVBox" type="VBoxContainer" parent="."] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 31.0 +offset_top = 22.0 +offset_right = -31.0 +offset_bottom = -22.0 +grow_horizontal = 2 +grow_vertical = 2 +theme = SubResource("Theme_w723v") + +[node name="Label" type="Label" parent="MainVBox"] +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 8 +theme_override_font_sizes/font_size = 50 +text = "HOPPY EASTER GAME THING" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="ButtonsVbox" type="VBoxContainer" parent="MainVBox"] +custom_minimum_size = Vector2(0, 495) +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 3 +theme_override_constants/separation = 10 +alignment = 1 + +[node name="PlayButton" type="Button" parent="MainVBox/ButtonsVbox"] +custom_minimum_size = Vector2(0, 40) +layout_mode = 2 +focus_neighbor_left = NodePath("../QuitButton") +focus_neighbor_top = NodePath("../QuitButton") +focus_neighbor_right = NodePath("../SettingsButton") +focus_neighbor_bottom = NodePath("../SettingsButton") +focus_next = NodePath("../SettingsButton") +focus_previous = NodePath("../QuitButton") +text = "Play" + +[node name="SettingsButton" type="Button" parent="MainVBox/ButtonsVbox"] +custom_minimum_size = Vector2(0, 40) +layout_mode = 2 +focus_neighbor_left = NodePath("../PlayButton") +focus_neighbor_top = NodePath("../PlayButton") +focus_neighbor_right = NodePath("../AboutButton") +focus_neighbor_bottom = NodePath("../AboutButton") +focus_next = NodePath("../AboutButton") +focus_previous = NodePath("../PlayButton") +text = "Settings" + +[node name="AboutButton" type="Button" parent="MainVBox/ButtonsVbox"] +custom_minimum_size = Vector2(0, 40) +layout_mode = 2 +focus_neighbor_left = NodePath("../SettingsButton") +focus_neighbor_top = NodePath("../SettingsButton") +focus_neighbor_right = NodePath("../QuitButton") +focus_neighbor_bottom = NodePath("../QuitButton") +focus_next = NodePath("../QuitButton") +focus_previous = NodePath("../SettingsButton") +text = "About" + +[node name="QuitButton" type="Button" parent="MainVBox/ButtonsVbox"] +custom_minimum_size = Vector2(0, 40) +layout_mode = 2 +focus_neighbor_left = NodePath("../AboutButton") +focus_neighbor_top = NodePath("../AboutButton") +focus_neighbor_right = NodePath("../PlayButton") +focus_neighbor_bottom = NodePath("../PlayButton") +focus_next = NodePath("../PlayButton") +focus_previous = NodePath("../AboutButton") +text = "Quit" + +[node name="MusicPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("13_3j724") +autoplay = true +bus = &"Music" + +[connection signal="pressed" from="MainVBox/ButtonsVbox/PlayButton" to="." method="_on_play_button_pressed"] +[connection signal="pressed" from="MainVBox/ButtonsVbox/SettingsButton" to="." method="_on_settings_button_pressed"] +[connection signal="pressed" from="MainVBox/ButtonsVbox/AboutButton" to="." method="_on_about_button_pressed"] +[connection signal="pressed" from="MainVBox/ButtonsVbox/QuitButton" to="." method="_on_quit_button_pressed"] diff --git a/Scenes/Test.tscn b/Scenes/Test.tscn deleted file mode 100644 index 55d7259..0000000 --- a/Scenes/Test.tscn +++ /dev/null @@ -1,169 +0,0 @@ -[gd_scene load_steps=16 format=3 uid="uid://cugui0mjc6cfe"] - -[ext_resource type="TileSet" uid="uid://bj7uu2180mie3" path="res://Assets/Tileset.tres" id="1_s4utw"] -[ext_resource type="Script" path="res://Scripts/MapGenerator.gd" id="2_yhpwh"] -[ext_resource type="Script" path="res://Scripts/EntitySystem/BunnyGenerator.gd" id="3_dvklj"] -[ext_resource type="PackedScene" uid="uid://cpl4tllohhyel" path="res://Prefabs/bunny.tscn" id="4_0fyd5"] -[ext_resource type="Script" path="res://Scripts/PlayerController.gd" id="5_uv7bh"] -[ext_resource type="Texture2D" uid="uid://ojlfqxj5bilo" path="res://Assets/Sprites/Jesus/jesus_spritesheet.png" id="6_es2l8"] -[ext_resource type="Script" path="res://Scripts/WeaponSystem/WeaponController.gd" id="7_8kdie"] -[ext_resource type="PackedScene" uid="uid://csxh42o8twxwn" path="res://Prefabs/projectile.tscn" id="8_wx0kk"] - -[sub_resource type="Animation" id="Animation_kdxam"] -resource_name = "Idle" -length = 0.1 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Player Sprite:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [0] -} - -[sub_resource type="Animation" id="Animation_dwpep"] -resource_name = "MoveDown" -length = 0.8 -loop_mode = 1 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Player Sprite:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = false -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1), -"update": 1, -"values": [0, 1, 2, 3, 4, 5, 6, 7] -} - -[sub_resource type="Animation" id="Animation_2jvl5"] -resource_name = "MoveLeft" -length = 0.8 -loop_mode = 1 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Player Sprite:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1), -"update": 1, -"values": [24, 25, 26, 27, 28, 29, 30, 31] -} - -[sub_resource type="Animation" id="Animation_4ig1u"] -resource_name = "MoveRight" -length = 0.8 -loop_mode = 1 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Player Sprite:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1), -"update": 1, -"values": [8, 9, 10, 11, 12, 13, 14, 15] -} - -[sub_resource type="Animation" id="Animation_pswkh"] -resource_name = "MoveUp" -length = 0.8 -loop_mode = 1 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Player Sprite:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1), -"update": 1, -"values": [16, 17, 18, 19, 20, 21, 22, 23] -} - -[sub_resource type="Animation" id="Animation_o3hln"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Player Sprite:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [0] -} - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_bi1h3"] -_data = { -"Idle": SubResource("Animation_kdxam"), -"MoveDown": SubResource("Animation_dwpep"), -"MoveLeft": SubResource("Animation_2jvl5"), -"MoveRight": SubResource("Animation_4ig1u"), -"MoveUp": SubResource("Animation_pswkh"), -"RESET": SubResource("Animation_o3hln") -} - -[node name="Player Movement" type="Node2D"] - -[node name="Map Generator" type="TileMap" parent="."] -scale = Vector2(1.5, 1.5) -tile_set = ExtResource("1_s4utw") -cell_quadrant_size = 32 -format = 2 -script = ExtResource("2_yhpwh") -start_area_corner_size = 3 - -[node name="Bunny Generator" type="Node" parent="." node_paths=PackedStringArray("player")] -script = ExtResource("3_dvklj") -bunny_prefab = ExtResource("4_0fyd5") -player = NodePath("../Player") - -[node name="Player" type="CharacterBody2D" parent="." node_paths=PackedStringArray("animation_player")] -position = Vector2(1440, 810) -collision_layer = 0 -script = ExtResource("5_uv7bh") -speed = 60 -animation_player = NodePath("Player Animator") - -[node name="Player Sprite" type="Sprite2D" parent="Player"] -position = Vector2(0, -20) -texture = ExtResource("6_es2l8") -hframes = 8 -vframes = 4 - -[node name="Player Collider" type="CollisionPolygon2D" parent="Player"] -position = Vector2(2, -24) -polygon = PackedVector2Array(12, 32, -16, 32, -16, -24, 12, -24) - -[node name="Player Camera" type="Camera2D" parent="Player"] -position = Vector2(-1, -25) -zoom = Vector2(3, 3) -position_smoothing_enabled = true -drag_horizontal_enabled = true -drag_vertical_enabled = true -editor_draw_drag_margin = true - -[node name="Player Animator" type="AnimationPlayer" parent="Player"] -libraries = { -"": SubResource("AnimationLibrary_bi1h3") -} - -[node name="WeaponController" type="Node2D" parent="Player"] -position = Vector2(0, -16) -script = ExtResource("7_8kdie") -projectile_prefab = ExtResource("8_wx0kk") diff --git a/Scripts/UI/MainMenuManager.gd b/Scripts/UI/MainMenuManager.gd index cd71434..16405f1 100644 --- a/Scripts/UI/MainMenuManager.gd +++ b/Scripts/UI/MainMenuManager.gd @@ -2,7 +2,7 @@ extends Node @export var game_scene : Resource @export var settings_scene : Resource -@export var default_focus : TextureButton +@export var default_focus : Control # Engine Callbackss func _ready(): diff --git a/Scripts/UI/SettingsMenu.gd b/Scripts/UI/SettingsMenu.gd index 4368726..dba1764 100644 --- a/Scripts/UI/SettingsMenu.gd +++ b/Scripts/UI/SettingsMenu.gd @@ -38,7 +38,7 @@ func _ready(): GlobalSettings.update_sfx_volume(Save.game_data.sfx_volume) pass -func _process(delta): +func _process(_delta): update_change_tab() pass diff --git a/project.godot b/project.godot index a013de7..12f6809 100644 --- a/project.godot +++ b/project.godot @@ -17,7 +17,7 @@ config/icon="res://icon.svg" [audio] -buses/default_bus_layout="res://Assets/Temp Music/default_bus_layout.tres" +buses/default_bus_layout="res://Assets/Music/default_bus_layout.tres" [autoload] @@ -37,7 +37,7 @@ project/assembly_name="HoppyEaster" [gui] -theme/custom="res://Assets/UI/UI_Theme.tres" +theme/custom="res://Assets/UI/Theme.tres" [input] @@ -168,16 +168,14 @@ aim_down_controller={ } ui_tab_left={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":9,"pressure":0.0,"pressed":true,"script":null) +"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":9,"pressure":0.0,"pressed":true,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"echo":false,"script":null) ] } ui_tab_right={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":10,"pressure":0.0,"pressed":true,"script":null) +"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":10,"pressure":0.0,"pressed":true,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"echo":false,"script":null) ] } From 4e6c65d8ea159586b5a35713ebd3d65f64d0d492 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Mon, 10 Apr 2023 23:47:14 +0200 Subject: [PATCH 10/26] Fixing Bunny Animations by using dot Products --- Assets/UI/Theme.tres | 4 +-- Prefabs/bunny.tscn | 58 +++++++++++++++++------------------ Scripts/EntitySystem/Bunny.gd | 26 ++++++++++------ 3 files changed, 47 insertions(+), 41 deletions(-) diff --git a/Assets/UI/Theme.tres b/Assets/UI/Theme.tres index 8fa7dc9..fe4f3c6 100644 --- a/Assets/UI/Theme.tres +++ b/Assets/UI/Theme.tres @@ -41,7 +41,7 @@ [ext_resource type="StyleBox" uid="uid://0jfr1uwuog0s" path="res://Assets/UI/Slider/v/background.tres" id="39_dl1e4"] [ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="40_bmcvq"] -[sub_resource type="Image" id="Image_hhwo6"] +[sub_resource type="Image" id="Image_kwuuq"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0), "format": "RGBA8", @@ -51,7 +51,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_g5bup"] -image = SubResource("Image_hhwo6") +image = SubResource("Image_kwuuq") [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_sj7h5"] diff --git a/Prefabs/bunny.tscn b/Prefabs/bunny.tscn index 7cd45e4..4f4e0a5 100644 --- a/Prefabs/bunny.tscn +++ b/Prefabs/bunny.tscn @@ -8,10 +8,8 @@ [sub_resource type="CircleShape2D" id="CircleShape2D_itvjj"] radius = 14.0 -[sub_resource type="Animation" id="Animation_l8j6b"] -resource_name = "MoveLeft" -length = 0.5 -loop_mode = 1 +[sub_resource type="Animation" id="Animation_6br4g"] +resource_name = "Idle" tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -19,27 +17,10 @@ tracks/0/path = NodePath("Sprite2D:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 1, -"values": [5, 6, 7, 8, 9] -} - -[sub_resource type="Animation" id="Animation_45lfy"] -resource_name = "MoveUp" -length = 0.5 -loop_mode = 1 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1), -"update": 1, -"values": [15, 16, 17, 18, 19] +"values": [0] } [sub_resource type="Animation" id="Animation_olc18"] @@ -59,6 +40,23 @@ tracks/0/keys = { "values": [0, 1, 2, 3, 4] } +[sub_resource type="Animation" id="Animation_l8j6b"] +resource_name = "MoveLeft" +length = 0.5 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), +"update": 1, +"values": [5, 6, 7, 8, 9] +} + [sub_resource type="Animation" id="Animation_agj62"] resource_name = "MoveRight" length = 0.5 @@ -76,8 +74,10 @@ tracks/0/keys = { "values": [10, 11, 12, 13, 14] } -[sub_resource type="Animation" id="Animation_6br4g"] -resource_name = "Idle" +[sub_resource type="Animation" id="Animation_45lfy"] +resource_name = "MoveUp" +length = 0.5 +loop_mode = 1 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -85,10 +85,10 @@ tracks/0/path = NodePath("Sprite2D:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), "update": 1, -"values": [0] +"values": [15, 16, 17, 18, 19] } [sub_resource type="Animation" id="Animation_mp212"] diff --git a/Scripts/EntitySystem/Bunny.gd b/Scripts/EntitySystem/Bunny.gd index 5889c6a..afa660f 100644 --- a/Scripts/EntitySystem/Bunny.gd +++ b/Scripts/EntitySystem/Bunny.gd @@ -38,6 +38,8 @@ func _physics_process(delta): if delta > 0.5: print(delta) move_and_slide() + else: + animation_player.stop() pass func _on_collision(body): @@ -67,18 +69,22 @@ func sub_on_death(callback : Callable): pass func update_animation(): - var move_vector = Vector2(1 if velocity.x > 0 else (-1 if velocity.x < 0 else 0), 1 if velocity.y > 0 else (-1 if velocity.y < 0 else 0)) - match move_vector: + match self.velocity: Vector2.ZERO: animation_player.play("Idle") - Vector2.LEFT: animation_player.play("MoveLeft") - Vector2.RIGHT: animation_player.play("MoveRight") - Vector2.UP: animation_player.play("MoveUp") - Vector2.DOWN: animation_player.play("MoveDown") - _: handle_diagonal_animations(move_vector) + _: handle_diagonal_animations(self.velocity) pass func handle_diagonal_animations(dir : Vector2): - if (dir.y > 0 and dir.x < 0) or (dir.y < 0 and dir.x < 0): animation_player.play("MoveLeft") - elif (dir.y > 0 and dir.x > 0) or (dir.y < 0 and dir.x > 0): animation_player.play("MoveRight") - else: animation_player.play("Idle") + + var left_dot = Vector2.LEFT.dot(dir) + var right_dot = Vector2.RIGHT.dot(dir) + var up_dot = Vector2.UP.dot(dir) + var down_dot = Vector2.DOWN.dot(dir) + + var max_dot = minf(left_dot, minf(right_dot, minf(up_dot, down_dot))) + match max_dot: + left_dot: animation_player.play("MoveLeft") + right_dot: animation_player.play("MoveRight") + up_dot: animation_player.play("MoveUp") + down_dot: animation_player.play("MoveDown") pass From b284b325c9c1ccd9246b1da66821659e091f80f0 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Mon, 10 Apr 2023 23:50:19 +0200 Subject: [PATCH 11/26] Cleaning Code --- Scripts/EntitySystem/Bunny.gd | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/Scripts/EntitySystem/Bunny.gd b/Scripts/EntitySystem/Bunny.gd index afa660f..811e925 100644 --- a/Scripts/EntitySystem/Bunny.gd +++ b/Scripts/EntitySystem/Bunny.gd @@ -71,20 +71,16 @@ func sub_on_death(callback : Callable): func update_animation(): match self.velocity: Vector2.ZERO: animation_player.play("Idle") - _: handle_diagonal_animations(self.velocity) - pass - -func handle_diagonal_animations(dir : Vector2): - - var left_dot = Vector2.LEFT.dot(dir) - var right_dot = Vector2.RIGHT.dot(dir) - var up_dot = Vector2.UP.dot(dir) - var down_dot = Vector2.DOWN.dot(dir) - - var max_dot = minf(left_dot, minf(right_dot, minf(up_dot, down_dot))) - match max_dot: - left_dot: animation_player.play("MoveLeft") - right_dot: animation_player.play("MoveRight") - up_dot: animation_player.play("MoveUp") - down_dot: animation_player.play("MoveDown") + _: + var left_dot = Vector2.LEFT.dot(self.velocity) + var right_dot = Vector2.RIGHT.dot(self.velocity) + var up_dot = Vector2.UP.dot(self.velocity) + var down_dot = Vector2.DOWN.dot(self.velocity) + + var max_dot = maxf(left_dot, maxf(right_dot, maxf(up_dot, down_dot))) + match max_dot: + left_dot: animation_player.play("MoveLeft") + right_dot: animation_player.play("MoveRight") + up_dot: animation_player.play("MoveUp") + down_dot: animation_player.play("MoveDown") pass From 4ad79253b2d7cee1b5fcce79fcaab52a53cea7e4 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Mon, 10 Apr 2023 23:55:55 +0200 Subject: [PATCH 12/26] Merge Brocken Saving of Rempaping --- Scripts/SaveSystem/GameDataSaver.gd | 4 ++++ Scripts/SaveSystem/GlobalSettings.gd | 13 +++++++++++++ Scripts/UI/MainMenuManager.gd | 1 + Scripts/UI/Remaping/RemapController.gd | 4 +++- 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Scripts/SaveSystem/GameDataSaver.gd b/Scripts/SaveSystem/GameDataSaver.gd index 4013988..30b90bb 100644 --- a/Scripts/SaveSystem/GameDataSaver.gd +++ b/Scripts/SaveSystem/GameDataSaver.gd @@ -13,6 +13,10 @@ func load_data(): "display_mode": 0, "vsync_on": false, "current_resolution_index": 0, + "move_up": KEY_W, + "move_down": KEY_S, + "move_left": KEY_A, + "move_right": KEY_D, "master_volume": 0, "music_volume": 0, "sfx_volume": 0, diff --git a/Scripts/SaveSystem/GlobalSettings.gd b/Scripts/SaveSystem/GlobalSettings.gd index 667d236..0890f19 100644 --- a/Scripts/SaveSystem/GlobalSettings.gd +++ b/Scripts/SaveSystem/GlobalSettings.gd @@ -4,6 +4,8 @@ extends Node @export var music_bus_index : int = 1 @export var sfx_bus_index : int = 2 +@export var remappable_input_actions = ["move_up", "move_down", "move_left", "move_right"] + const resolutions_dictionary : Dictionary = { "800x600" : Vector2(800, 600), "1024x546" : Vector2(1024, 546), @@ -59,3 +61,14 @@ func update_sfx_volume(vol : int) -> void: Save.save_data() AudioServer.set_bus_volume_db(sfx_bus_index, vol) pass + +# Controls +func set_controls_from_save_file() -> void: + for remappable_input_action in remappable_input_actions: + for i in Save.game_data.keys().size(): + if Save.game_data.keys()[i] == remappable_input_action: + for key in InputMap.action_get_events(remappable_input_action): + InputMap.action_erase_event(remappable_input_action, key) + var control_key = InputEventKey.new() + control_key.set_keycode(Save.game_data.values()[i]) + InputMap.action_add_event(remappable_input_action, control_key) diff --git a/Scripts/UI/MainMenuManager.gd b/Scripts/UI/MainMenuManager.gd index 16405f1..6d2cc53 100644 --- a/Scripts/UI/MainMenuManager.gd +++ b/Scripts/UI/MainMenuManager.gd @@ -6,6 +6,7 @@ extends Node # Engine Callbackss func _ready(): + GlobalSettings.set_controls_from_save_file() GlobalSettings.set_display_mode(Save.game_data.display_mode) GlobalSettings.toggle_vsync(Save.game_data.vsync_on) GlobalSettings.set_resolution(Save.game_data.current_resolution_index) diff --git a/Scripts/UI/Remaping/RemapController.gd b/Scripts/UI/Remaping/RemapController.gd index a75eb2d..f054198 100644 --- a/Scripts/UI/Remaping/RemapController.gd +++ b/Scripts/UI/Remaping/RemapController.gd @@ -26,8 +26,10 @@ func remap_key(event): print(event) # Do Actual Rebinding for key in InputMap.action_get_events(remap_action): - InputMap.action_erase_event(remap_action, key) + InputMap.action_erase_event(remap_action, key) InputMap.action_add_event(remap_action, event) + print(event.as_text_keycode()) + #Save.game_data["%s" % [remap_action]] = event.get_text_keycode() remap_button.display_key() remap_button = null set_process_unhandled_key_input(false) From 07aa3c846bb09fa6d03b08443489c84d5809c732 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 11 Apr 2023 00:27:26 +0200 Subject: [PATCH 13/26] Fixing Rebind, (With Saving) --- Assets/UI/Theme.tres | 4 +-- Prefabs/Settings Menu.tscn | 4 --- Scripts/SaveSystem/GlobalSettings.gd | 5 ++++ Scripts/UI/MenuButton.gd | 38 -------------------------- Scripts/UI/Remaping/RemapController.gd | 17 ++++++------ Scripts/UI/SettingsMenu.gd | 1 + 6 files changed, 16 insertions(+), 53 deletions(-) delete mode 100644 Scripts/UI/MenuButton.gd diff --git a/Assets/UI/Theme.tres b/Assets/UI/Theme.tres index fe4f3c6..1de8275 100644 --- a/Assets/UI/Theme.tres +++ b/Assets/UI/Theme.tres @@ -41,7 +41,7 @@ [ext_resource type="StyleBox" uid="uid://0jfr1uwuog0s" path="res://Assets/UI/Slider/v/background.tres" id="39_dl1e4"] [ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="40_bmcvq"] -[sub_resource type="Image" id="Image_kwuuq"] +[sub_resource type="Image" id="Image_cw2pn"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0), "format": "RGBA8", @@ -51,7 +51,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_g5bup"] -image = SubResource("Image_kwuuq") +image = SubResource("Image_cw2pn") [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_sj7h5"] diff --git a/Prefabs/Settings Menu.tscn b/Prefabs/Settings Menu.tscn index 463ba22..f16e747 100644 --- a/Prefabs/Settings Menu.tscn +++ b/Prefabs/Settings Menu.tscn @@ -195,7 +195,6 @@ vertical_alignment = 1 [node name="MoveUpRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 -toggle_mode = true script = ExtResource("2_4asaa") input_action_name = "move_up" remap_controller = NodePath("../../../../../Remap Controller") @@ -209,7 +208,6 @@ vertical_alignment = 1 [node name="MoveLeftRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 size_flags_horizontal = 3 -toggle_mode = true script = ExtResource("2_4asaa") input_action_name = "move_left" remap_controller = NodePath("../../../../../Remap Controller") @@ -223,7 +221,6 @@ vertical_alignment = 1 [node name="MoveDownRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 size_flags_horizontal = 3 -toggle_mode = true script = ExtResource("2_4asaa") input_action_name = "move_down" remap_controller = NodePath("../../../../../Remap Controller") @@ -238,7 +235,6 @@ vertical_alignment = 1 layout_mode = 2 size_flags_horizontal = 3 focus_neighbor_bottom = NodePath("../../../../../Back Button") -toggle_mode = true script = ExtResource("2_4asaa") input_action_name = "move_right" remap_controller = NodePath("../../../../../Remap Controller") diff --git a/Scripts/SaveSystem/GlobalSettings.gd b/Scripts/SaveSystem/GlobalSettings.gd index 0890f19..9f9313c 100644 --- a/Scripts/SaveSystem/GlobalSettings.gd +++ b/Scripts/SaveSystem/GlobalSettings.gd @@ -72,3 +72,8 @@ func set_controls_from_save_file() -> void: var control_key = InputEventKey.new() control_key.set_keycode(Save.game_data.values()[i]) InputMap.action_add_event(remappable_input_action, control_key) + pass + +func set_control_binding(action : String, keycode : int): + print(keycode) + pass diff --git a/Scripts/UI/MenuButton.gd b/Scripts/UI/MenuButton.gd deleted file mode 100644 index f257cdd..0000000 --- a/Scripts/UI/MenuButton.gd +++ /dev/null @@ -1,38 +0,0 @@ -extends TextureButton - -@export var text : String = "Sample Text" -@export var pointer_margin_from_center : int = 100 -@export var leftPointer : Sprite2D -@export var rightPointer : Sprite2D -@export var textBox : RichTextLabel - -# Engine Callbacks -func _ready(): - textBox.parse_bbcode("[center] %s [/center]" % [text]) - pass - -func _process(_delta): - handle_hover_and_focus() - handle_x_position() - -func handle_hover_and_focus() -> void: - if has_focus(): - leftPointer.visible = true - rightPointer.visible = true - elif is_hovered(): - leftPointer.visible = true - leftPointer.modulate.a = 0.5 - rightPointer.visible = true - rightPointer.modulate.a = 0.5 - else: - leftPointer.visible = false - leftPointer.modulate.a = 1 - rightPointer.visible = false - rightPointer.modulate.a = 1 - pass - -func handle_x_position() -> void: - var center_x = get_parent().position.x + (get_parent().size.x / 2.0) - leftPointer.global_position.x = center_x - pointer_margin_from_center - rightPointer.global_position.x = center_x + pointer_margin_from_center - pass diff --git a/Scripts/UI/Remaping/RemapController.gd b/Scripts/UI/Remaping/RemapController.gd index f054198..5de1459 100644 --- a/Scripts/UI/Remaping/RemapController.gd +++ b/Scripts/UI/Remaping/RemapController.gd @@ -20,17 +20,16 @@ func start_remap(button : Button, action : String): remap_action = action remap_button.text = "..." set_process_unhandled_key_input(true) + button.release_focus() pass func remap_key(event): - print(event) - # Do Actual Rebinding - for key in InputMap.action_get_events(remap_action): - InputMap.action_erase_event(remap_action, key) - InputMap.action_add_event(remap_action, event) - print(event.as_text_keycode()) - #Save.game_data["%s" % [remap_action]] = event.get_text_keycode() - remap_button.display_key() - remap_button = null set_process_unhandled_key_input(false) + for key in InputMap.action_get_events(remap_action): + InputMap.action_erase_event(remap_action, key) + InputMap.action_add_event(remap_action, event) + Save.game_data["%s" % [remap_action]] = event.keycode + remap_button.display_key() + remap_button.grab_focus() + remap_button = null pass diff --git a/Scripts/UI/SettingsMenu.gd b/Scripts/UI/SettingsMenu.gd index dba1764..8e805af 100644 --- a/Scripts/UI/SettingsMenu.gd +++ b/Scripts/UI/SettingsMenu.gd @@ -67,6 +67,7 @@ func add_resolution_items(): # Other Buttons func _on_back_pressed(): + Save.save_data() on_back.call() queue_free() pass From d3a27af77b606a00b45f6c05f7ad1dd248e734b8 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 11 Apr 2023 02:13:08 +0200 Subject: [PATCH 14/26] Controller Gamepad Suport for Rebind UI (Kindof, still needs polish) --- Prefabs/Settings Menu.tscn | 109 ++++++++++++++++++++++++- Scripts/SaveSystem/GameDataSaver.gd | 9 +- Scripts/SaveSystem/GlobalSettings.gd | 43 +++++++--- Scripts/UI/Remaping/RemapButton.gd | 8 +- Scripts/UI/Remaping/RemapController.gd | 35 +++++++- Scripts/UI/SettingsMenu.gd | 2 + 6 files changed, 185 insertions(+), 21 deletions(-) diff --git a/Prefabs/Settings Menu.tscn b/Prefabs/Settings Menu.tscn index f16e747..2d389da 100644 --- a/Prefabs/Settings Menu.tscn +++ b/Prefabs/Settings Menu.tscn @@ -7,13 +7,14 @@ [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_02uod"] bg_color = Color(0.439216, 0.631373, 0.537255, 1) -[node name="SettingsMenu" type="Node" node_paths=PackedStringArray("back_button", "tab_container", "bottom_item_video", "bottom_item_audio", "bottom_item_controls", "display_options_button", "vsync_toggle", "resolutions_options_button", "master_volume_slider", "music_volume_slider", "sfx_volume_slider")] +[node name="SettingsMenu" type="Node" node_paths=PackedStringArray("back_button", "tab_container", "bottom_item_video", "bottom_item_audio", "bottom_item_controls", "bottom_item_controls_gamepad", "display_options_button", "vsync_toggle", "resolutions_options_button", "master_volume_slider", "music_volume_slider", "sfx_volume_slider")] script = ExtResource("1_2rgd2") back_button = NodePath("Back Button") tab_container = NodePath("SettingsTabs") bottom_item_video = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/ResolutionsOptions") bottom_item_audio = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider") -bottom_item_controls = NodePath("SettingsTabs/Controls/MarginContainer/GridContainer/MoveRightRemapButton") +bottom_item_controls = NodePath("SettingsTabs/Controls/MarginContainer/GridContainer/AttackRemapButton") +bottom_item_controls_gamepad = NodePath("SettingsTabs/Gamepad/MarginContainer/GridContainer/AttackRemapButton") display_options_button = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/DisplayModeOptions") vsync_toggle = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/VsyncButton") resolutions_options_button = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/ResolutionsOptions") @@ -239,6 +240,104 @@ script = ExtResource("2_4asaa") input_action_name = "move_right" remap_controller = NodePath("../../../../../Remap Controller") +[node name="AttackLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] +custom_minimum_size = Vector2(400, 40) +layout_mode = 2 +text = "Attack +" +vertical_alignment = 1 + +[node name="AttackRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +layout_mode = 2 +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../Back Button") +script = ExtResource("2_4asaa") +input_action_name = "attack" +remap_controller = NodePath("../../../../../Remap Controller") + +[node name="Gamepad" type="VBoxContainer" parent="SettingsTabs"] +visible = false +layout_mode = 2 + +[node name="MarginContainer" type="MarginContainer" parent="SettingsTabs/Gamepad"] +custom_minimum_size = Vector2(0, 425) +layout_mode = 2 +theme_override_constants/margin_left = 25 +theme_override_constants/margin_top = 25 +theme_override_constants/margin_right = 25 +theme_override_constants/margin_bottom = 25 + +[node name="GridContainer" type="GridContainer" parent="SettingsTabs/Gamepad/MarginContainer"] +layout_mode = 2 +columns = 2 + +[node name="MoveUpLabel" type="Label" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer"] +custom_minimum_size = Vector2(400, 40) +layout_mode = 2 +text = "Move Up" +vertical_alignment = 1 + +[node name="MoveUpRemapButton" type="Button" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +layout_mode = 2 +script = ExtResource("2_4asaa") +input_action_name = "move_up_controller" +remap_controller = NodePath("../../../../../Remap Controller") + +[node name="MoveLeftLabel" type="Label" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer"] +custom_minimum_size = Vector2(400, 40) +layout_mode = 2 +text = "Move Left" +vertical_alignment = 1 + +[node name="MoveLeftRemapButton" type="Button" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +layout_mode = 2 +size_flags_horizontal = 3 +script = ExtResource("2_4asaa") +input_action_name = "move_left_controller" +remap_controller = NodePath("../../../../../Remap Controller") + +[node name="MoveDownLabel" type="Label" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer"] +custom_minimum_size = Vector2(400, 40) +layout_mode = 2 +text = "Move Down" +vertical_alignment = 1 + +[node name="MoveDownRemapButton" type="Button" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +layout_mode = 2 +size_flags_horizontal = 3 +script = ExtResource("2_4asaa") +input_action_name = "move_down_controller" +remap_controller = NodePath("../../../../../Remap Controller") + +[node name="MoveRightLabel" type="Label" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer"] +custom_minimum_size = Vector2(400, 40) +layout_mode = 2 +text = "Move RIght" +vertical_alignment = 1 + +[node name="MoveRightRemapButton" type="Button" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +layout_mode = 2 +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../Back Button") +script = ExtResource("2_4asaa") +input_action_name = "move_right_controller" +remap_controller = NodePath("../../../../../Remap Controller") + +[node name="AttackLabel" type="Label" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer"] +custom_minimum_size = Vector2(400, 40) +layout_mode = 2 +text = "Attack +" +vertical_alignment = 1 + +[node name="AttackRemapButton" type="Button" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +layout_mode = 2 +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../Back Button") +script = ExtResource("2_4asaa") +input_action_name = "attack" +remap_controller = NodePath("../../../../../Remap Controller") + [node name="Back Button" type="Button" parent="."] custom_minimum_size = Vector2(500, 40) anchors_preset = 7 @@ -268,4 +367,10 @@ text = "Back" [connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveLeftRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveLeftRemapButton" method="_on_pressed"] [connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveDownRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveDownRemapButton" method="_on_pressed"] [connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveRightRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveRightRemapButton" method="_on_pressed"] +[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/AttackRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/AttackRemapButton" method="_on_pressed"] +[connection signal="pressed" from="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveUpRemapButton" to="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveUpRemapButton" method="_on_pressed"] +[connection signal="pressed" from="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveLeftRemapButton" to="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveLeftRemapButton" method="_on_pressed"] +[connection signal="pressed" from="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveDownRemapButton" to="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveDownRemapButton" method="_on_pressed"] +[connection signal="pressed" from="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveRightRemapButton" to="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveRightRemapButton" method="_on_pressed"] +[connection signal="pressed" from="SettingsTabs/Gamepad/MarginContainer/GridContainer/AttackRemapButton" to="SettingsTabs/Gamepad/MarginContainer/GridContainer/AttackRemapButton" method="_on_pressed"] [connection signal="pressed" from="Back Button" to="." method="_on_back_pressed"] diff --git a/Scripts/SaveSystem/GameDataSaver.gd b/Scripts/SaveSystem/GameDataSaver.gd index 30b90bb..94203dd 100644 --- a/Scripts/SaveSystem/GameDataSaver.gd +++ b/Scripts/SaveSystem/GameDataSaver.gd @@ -13,13 +13,14 @@ func load_data(): "display_mode": 0, "vsync_on": false, "current_resolution_index": 0, - "move_up": KEY_W, - "move_down": KEY_S, - "move_left": KEY_A, - "move_right": KEY_D, "master_volume": 0, "music_volume": 0, "sfx_volume": 0, + "move_up": KEY_W, + "move_left": KEY_A, + "move_down": KEY_S, + "move_right": KEY_D, + "attack": "m" + str(MOUSE_BUTTON_LEFT), } save_data() else: diff --git a/Scripts/SaveSystem/GlobalSettings.gd b/Scripts/SaveSystem/GlobalSettings.gd index 9f9313c..85f3810 100644 --- a/Scripts/SaveSystem/GlobalSettings.gd +++ b/Scripts/SaveSystem/GlobalSettings.gd @@ -4,12 +4,18 @@ extends Node @export var music_bus_index : int = 1 @export var sfx_bus_index : int = 2 -@export var remappable_input_actions = ["move_up", "move_down", "move_left", "move_right"] +@export var remappable_input_actions = [ + "move_up", + "move_down", + "move_left", + "move_right", + "attack" +] const resolutions_dictionary : Dictionary = { "800x600" : Vector2(800, 600), "1024x546" : Vector2(1024, 546), - "1152x648" : Vector2(1152, 648), + "1280x720" : Vector2(1280, 720), "1600x900" : Vector2(1600, 900), "1366x768" : Vector2(1366, 768), "1920x1080" : Vector2(1920, 1080), @@ -65,15 +71,26 @@ func update_sfx_volume(vol : int) -> void: # Controls func set_controls_from_save_file() -> void: for remappable_input_action in remappable_input_actions: - for i in Save.game_data.keys().size(): - if Save.game_data.keys()[i] == remappable_input_action: - for key in InputMap.action_get_events(remappable_input_action): - InputMap.action_erase_event(remappable_input_action, key) - var control_key = InputEventKey.new() - control_key.set_keycode(Save.game_data.values()[i]) - InputMap.action_add_event(remappable_input_action, control_key) - pass - -func set_control_binding(action : String, keycode : int): - print(keycode) + var action = Save.game_data.keys().find(remappable_input_action) + for key in InputMap.action_get_events(remappable_input_action): + InputMap.action_erase_event(remappable_input_action, key) + var binding = Save.game_data.values()[action] + var control_event + match str(binding)[0]: + "m": + binding = int(binding.right(binding.length()-1)) + control_event = InputEventMouseButton.new() + control_event.button_index = binding + "b": + binding = int(binding.right(binding.length()-1)) + control_event = InputEventJoypadButton.new() + control_event.button_index = binding + "j": + binding = int(binding.right(binding.length()-1)) + control_event = InputEventJoypadMotion.new() + control_event.axis = binding + _: + control_event = InputEventKey.new() + control_event.set_keycode(binding) + InputMap.action_add_event(remappable_input_action, control_event) pass diff --git a/Scripts/UI/Remaping/RemapButton.gd b/Scripts/UI/Remaping/RemapButton.gd index b35bba2..2a47aae 100644 --- a/Scripts/UI/Remaping/RemapButton.gd +++ b/Scripts/UI/Remaping/RemapButton.gd @@ -7,7 +7,13 @@ func _ready(): display_key() func display_key (): - text = "%s" % InputMap.action_get_events(input_action_name)[0].as_text() + self.text = "%s" % InputMap.action_get_events(input_action_name)[0].as_text() + if self.text.begins_with("Joypad Motion on Axis"): + var split_text = self.text.split(" ") + self.text = split_text[3] + " " + split_text[4] + if self.text.begins_with("Joypad Button"): + var split_text = self.text.split(" ") + self.text = split_text[1] + " " + split_text[2] pass func _on_pressed(): diff --git a/Scripts/UI/Remaping/RemapController.gd b/Scripts/UI/Remaping/RemapController.gd index 5de1459..e907185 100644 --- a/Scripts/UI/Remaping/RemapController.gd +++ b/Scripts/UI/Remaping/RemapController.gd @@ -1,24 +1,46 @@ extends Control +@export var min_time_between_remaps := 0.1 + var remap_button : Button var remap_action : String +var time_since_remap := 0.0 + func _unhandled_key_input(event): if remap_button != null and event.pressed: remap_key(event) pass +func _input(event): + if remap_button != null: + if event is InputEventMouseButton and event.pressed: + remap_key(event) + if event is InputEventJoypadButton and event.pressed: + print(event) + remap_key(event) + if event is InputEventJoypadMotion: + remap_key(event) + pass + func _ready(): set_process_unhandled_key_input(false) remap_button = null pass +func _process(delta): + if remap_button == null: + time_since_remap += delta + pass + func start_remap(button : Button, action : String): + if(time_since_remap < min_time_between_remaps): return if(remap_button != null): remap_button.display_key() remap_button = button remap_action = action remap_button.text = "..." + remap_button.disabled = true set_process_unhandled_key_input(true) button.release_focus() pass @@ -28,8 +50,19 @@ func remap_key(event): for key in InputMap.action_get_events(remap_action): InputMap.action_erase_event(remap_action, key) InputMap.action_add_event(remap_action, event) - Save.game_data["%s" % [remap_action]] = event.keycode + + match str(event.get_class()): + "InputEventJoypadButton": + Save.game_data["%s" % [remap_action]] = "b" + str(event.button_index) + "InputEventJoypadMotion": + Save.game_data["%s" % [remap_action]] = "j" + str(event.axis) + "InputEventMouseButton": + Save.game_data["%s" % [remap_action]] = "m" + str(event.button_index) + "InputEventKey": + Save.game_data["%s" % [remap_action]] = event.keycode remap_button.display_key() remap_button.grab_focus() + remap_button.disabled = false + time_since_remap = 0 remap_button = null pass diff --git a/Scripts/UI/SettingsMenu.gd b/Scripts/UI/SettingsMenu.gd index 8e805af..47a1db2 100644 --- a/Scripts/UI/SettingsMenu.gd +++ b/Scripts/UI/SettingsMenu.gd @@ -6,6 +6,7 @@ extends Node @export var bottom_item_video : Control @export var bottom_item_audio : Control @export var bottom_item_controls : Control +@export var bottom_item_controls_gamepad : Control @export var display_options_button : OptionButton @export var vsync_toggle : CheckButton @@ -58,6 +59,7 @@ func update_change_tab(): 0: back_button.focus_neighbor_top = bottom_item_video.get_path() 1: back_button.focus_neighbor_top = bottom_item_audio.get_path() 2: back_button.focus_neighbor_top = bottom_item_controls.get_path() + 3: back_button.focus_neighbor_top = bottom_item_controls_gamepad.get_path() back_button.grab_focus() pass From 9201e21c7825318364347fe0aa9180b1218aa15a Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 11 Apr 2023 10:03:20 +0200 Subject: [PATCH 15/26] New assets --- Assets/Sprites/EasterEgg.png | Bin 0 -> 2154 bytes Assets/Sprites/EasterEgg.png.import | 34 ++++++++++++++++++++++++++++ Assets/Sprites/GUI/Heart.png | Bin 0 -> 296 bytes Assets/Sprites/GUI/Heart.png.import | 34 ++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 Assets/Sprites/EasterEgg.png create mode 100644 Assets/Sprites/EasterEgg.png.import create mode 100644 Assets/Sprites/GUI/Heart.png create mode 100644 Assets/Sprites/GUI/Heart.png.import diff --git a/Assets/Sprites/EasterEgg.png b/Assets/Sprites/EasterEgg.png new file mode 100644 index 0000000000000000000000000000000000000000..19490c4d6c06d6cd52c0b89e7701b1fb123cc47e GIT binary patch literal 2154 zcmV-w2$lDVP)RQ|tTSDI}8{|o>Bm;Wmp;>yFT%I9t`YPMfw;?F)9R%hr>p8uWq8u`8} z001|WON76@>$>l&Zh9!qXZMX?LL&Sh#(q*iFNE`JA9SbPnoc+}+}^3kKcYMB*0jQr zQ0kwE#hBw!x1JomwE)44UZN&rBBS=*K%2LsqzmPxspW|;y^`N@xp}Og5^U?E`R8M67>iG4xmf(2g-K=Jmt#YF#@LXOUx+~6X}4C$p9KJTuQmiS8#^o# zQMUrryAci>J1i2(m6PwgqU7P-m($Vaf3_(<=P%7?0}(>*zM}G1&u0Su(tH-{-+w@9 zJ}V?ZZ2ZbnF_fR$m*eHw5Qz#I z^o4OuUl(DDB~^IIg_#J~9Cw4d(wT&vyfxh8xk zPfzFW)OOx3D3gx=#2=6RbnHgHcI-wzQU0Be+X83Y&nA9quSPy|e&rzg`OPAnZ@#Vn zbq6BZHsJa5eODscw&-eYx6T^}%_mRo3omsYa&(F6*THcI00g5;R6pSm5bWE}{E~zB z&s&`NB^S$<`^tmhzx`cbpt8DJ+lB7T7V=m{H|34meVF*Eez-7p*H#39*!oTN&xJul zkEnjmuZ%#`7sma@iffyYy;u_R$FUoQ?U?N#`5TQo!mLSwMxze-IhyG0UEW^D;KB%| zFN~wBwLKBLy!8e^eI=C!nAwXZq>eg?*dMBo0RXD#L!ff$DilCquuBa;mVX97zfuc8 zhz4=_`OGNi?JD^?3zJrU-o+4q-;oo(ujA_1N+EcaSt~ye4&|*k=Bt=as9j~Uu9%67| zL@6E;3(wEF%3E*tA`lR4h(_(v)iQv+y`1W%CoKIpYOgQf0MV?>1>| zhKq<+aKpL{8~(6`TU}QewoKsmP604SXkf3dWQ0vbMpw)A2$ZyNWIJi$$To?DhgVrR zdyol;KXU)4ik!;pL{yZoqLZWA}*4Y^h_6R^5q#}(>7n8(TYg56u|{BJ-k?-J!(Xu z^2zz>bGf%Z2IT^nJNF*Poiyg~S}6*ZPtH%iCA_H5!Uh*c{4hr2hNNsjT=J*Ea8fq# zsliwT;E=@wK)a?yvl>bSuQID$jg`d%0LPuQvOH84N(5Ov0DMspxKL!DoPTiQw2)73 zcq-%Ex%Yk^UnmNnod433!~U*-avJ}+;kc95HkvI+JSsRHZT3t08mNRUV{qcM_#%b~ zOP8OX$>0tD&I?8qKra-YpPm6sKom8o8%VC6!6cp}U?Uy^i9!~GNhq?< z1QLZT29r=^ABQiXe0e6&=z|L*!duOs+vMl)Dzkw`FU@C#x0*k<$xo0sN;zm1TPO=# z)wY56YC~9^<*?cDx8svmim zAZ+5Jn&MO7a5K63ER6SmG=t!S!?=F`2Yspp8b>(pfN6BxV5oj#`OyF0YPnHjN znIK0Yeh#=h?biB^oCv(FVJqDnaum9JuPD|}gd?&x;ODUSliwc$srqex_^S~=0Oc4$ z-uaE|2h?jssiTf|NK?}zu9{7<8{K)EZ++-dNU5;h|fUGXCznwjfN!`GY)O5T6 z0F+gZ$Ls3RGLv)cXBj1{3vdj8#ShO5XegzuasXgC#|Gx}af@6z&DWi~rT~SN_$TS- z-FHNPiS2OGTf#avF4AEF_De{I$)!C^0+NU>AazMZ7obQYde=Fe6EM3j0ZGKwZHM1C uDf>xDUG9_OM0TrVr*1pEQ?VJ|xBCUVoV&W^C=GxB00005M literal 0 HcmV?d00001 diff --git a/Assets/Sprites/GUI/Heart.png.import b/Assets/Sprites/GUI/Heart.png.import new file mode 100644 index 0000000..409bc13 --- /dev/null +++ b/Assets/Sprites/GUI/Heart.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://7j7ufllfyi0c" +path="res://.godot/imported/Heart.png-ebd7db14ae3fcb705890a9b88bc59e29.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Sprites/GUI/Heart.png" +dest_files=["res://.godot/imported/Heart.png-ebd7db14ae3fcb705890a9b88bc59e29.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 From 9c216a1dbab21cb32c181b50988c852ecd25425e Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 11 Apr 2023 10:33:19 +0200 Subject: [PATCH 16/26] Polish Menu --- Assets/Sprites/Jesus/jesus_spritesheet.png | Bin 5305 -> 5296 bytes Assets/UI/Theme.tres | 4 +- Scenes/Main Menu.tscn | 101 +++++++++++++++++---- Scripts/UI/MainMenuManager.gd | 3 + Scripts/UI/Remaping/RemapController.gd | 2 +- 5 files changed, 87 insertions(+), 23 deletions(-) diff --git a/Assets/Sprites/Jesus/jesus_spritesheet.png b/Assets/Sprites/Jesus/jesus_spritesheet.png index ff32cc32a6198ec54730632d3618d36ca3c547db..ccf64689fad98ef8b813f4b6c945bdc5cb9577c9 100644 GIT binary patch literal 5296 zcmaKwS6oxuw#IXiqM>aSf)qE3fK=%qC*Km8!ph2E>QdCibi1buKpXd*4Z2oYA zOsgIjbGE;-#Fj}62Uj$6j)|fIJA3)v_XqYmswyYrpb0zN3wQc=w)6sn18ss$HHW?} zOiu0_Yg&!cYm@}didM@^(A#w1U3?cG7w8v=IqC~XUyki<8ksy- zWlKsit&@KzEdL=%do%`UXW|MYlYkrZ z{6su^-%^b&fOL?VmTa;?Lh9zvY&Se@u*!4c!zhGv7mhy8vZC( z=A$2Ma20#y$Tu`TdU-)#YlC91r#oHf#6F_zNPZ?5hIZ{f>6qCyU%IFytW-c8lP&Zf zPB@k25nO2F7b3k+F36%-2ft~it> z@PpS!=XoTw?|;y+^b6ea$PD`8$3bKjk0I9Jg2yi#&6Zq13p$sP1p4#;KqtH!x55)q z_-YvtsDDoL#G`G@+-UbwG&{&Q>?uX_qe9HgOX$0HoDc=#tQFqh>JU2x=R%63XD`QA z?~XGK6XjcGPbj)W+pKaQ*eSemVgcd_P%wsn%zIp4imf3)DK7*@_zEAFyxc5RCio7L zrR3jAX>&HkQnX|`&+!_x5^+8n3`@+#x;GG?y6w`q!6YPoTt-0D*`SHHF zyivQleU#N{yW9Sj^HX?_w#RpLU6U9`>+~~ZpwGl;HnMsh@0~WbB}3EX_%G{em6PZF z!*ljR;;269VT!c%pXy&K%k(=RTbxKRmqfnMxtM+fCJ}!rS8Q2?U{^ROt z70735sME4@u@evC$iNhlKoNXpi^IK4zG2JZ;^t7i#}N>sTWKAq%Ci=D7fOq|SzQc2 zw79MHXzgDypY&2N>bwS8!*1RK6sA%G3sQt+0kJ7@mMjKMY6-TH_%>(W;J9XNBvL19s`Id zm)m)m++X~f;&aNSNP>|jZ`opM-?TYq?2mh8r7UUz#nICH&v(b_Sg7*j1dQ;*KoiSl z!w0^(sgs`bE@Jyz(hLoWn3{8bSr6VIcdSX0nW0)0caV7;TU(8DX2TL~O|8Y-%`d~t zdT8D-42^4R;X7f^=N#Mc+dlzm{+5eO4d%;Wgr*t1s*4e<#i_2gjrLAGlvOb9k(KR2 z!S{t!?r}yhckF9eTS3|0U{-qyN`uY z1ZY;FOd6t&-AC6yoXa%NRO^@-_>U$H$3$z<#v!)^OC^^Im`WL#zXPX_Adc>f#05xFdhl>ICyXgkSLr@WP z?sMc;si+@*$$^<&t$o4+PzFP-l0MW{?hUTL4goHO|T~ODUkfbjG!z?3+$K8u`*`-Cj;da@x#nE!KIc?v#kuiYycWc6?3yC z#-@vN;-xbmvBF=L;dH^%kFC8{+rD*-Hm1rY!^omm($UikcTOi0?IJ%I+mrMuNtO$j zt%Lv*klGH@Q$%VHmML)GA+~WO^-l|flGqw@v~wH7SU)tNWe~&qx?RjS1Ga!fsy^k1 zFIf|If@Ps4CmYUt>rCpMc2@0GhA^6z-_;ER`9;*j`Z%@3Nu2{w9ElABs z7N!vgJMh(>dU?@CO$a~5LUF(unit((3&LXR4-dmv)&K~o;Sw=BnQB-CAPc9nKz!Lv zf>9c|iZzg>_-3If`4d(HRhWa#uLq93dHZy6X{`KDm#2kp$W!RSI+FP37`0rRUs@WG zyj4uiJOufbztoogFf(lCp^e~k_VkPFY5?0=IbwqRL&M_~RgG?=kI4=R-*xrT+efI}a}Ovb$7Kli zkg2k4!{VM5%o4OGoGfZEF~Da2-rzJo7Q%*b9k6YdW3!j%_3SuzMbGL$bVQcct>+h^ zFRrR@x-XvLEsa-S@R>!qrSGWrD8=${e4drz$@HF0Bus|DXiw#fTAPHxull!z;ET;-{6N?9yW+2GA9bAul|+T!ItLx=^XNz zVd%9?-{6Rki13Iwiq!{}^9x%fq1? zL2=#lrJ^*Q>a!dc^&%!#@bHVMMTuY*BP9S!QCVivR*GhA;0G@shibWZ8@w5UW+#}( z1M*YJ-r|3UE#VX_;jF{Re_r&>ns1a zz^~)PIHk^5$+(;SUtb);iz->~H9Ux15g#obp)Kcy|cp}me=*d>-$J<3&u@(y& z2_|QfS>vuJE53Z9x+Xi=MY@9(t1n$uWRI0H@mTYS{JR9|$(bo;W;$;omNy%6?Pb&Z zGw7c)kK=T+^?wt_?@Zb|KsqB4NK)S=p!tS-e?+n~0GNxQ!gINP|9_(^Tu} zg0%{3Y=C8^9YN5c$rh3sFpu#u3{xW^F-T#5-wZGwyH$+4Ddj z-o#=>a=m9yfI=Q9Y)tNH(URDc)cOX&Pk78_M#RZ2u@TF+x<>4(b)DE)IELHDq7zat z<=PVLbBt_nDD=Koi%Sr;zo!0W%g5Ow%{8MH*c+PdW~94>|D$D$cRQ|L*IX%Jk2-T{ zNFX{cSE+ARm|sT{F5(d$$beBj(jj!%3fNWeAO&73L@v_bRzK1P= zt_#OTYpUMh)|jd<>9%-c?@!+)oFNwtCc6JNxm+iVqY`2;zmq>hu@Ck$>V~|XG8OK2 zdkThx`PC^0NTq}ixsTvgm_1y+<>o)PN05skWs6D__?p5}IJ!gN-ExJkbB10Q)v1{J zaw{Dpxxe+0mQtZp!^8r*y0+#b~jWA zlbbO!&>FuLiW5^E=$&oh91iA=JP1^N?{5G6Dpt~?2za7M=Z5nt5;k}tRIi~@0SuVK z*G*bFLvU^ZyS|v8wd3C&Hs%qk+W!j_BY|dI0XKCc;y#I1j5ix6FVf8y)uhZaOXS!C zA|$C#QCGyRW%V)h$JXCcxfiQ#9PG9f z<$#z?%It0$8TABijTf|qdU_2AFj;ZrZfzURs&w^cdCW^aHBIRcytTHFnRcd7LlAPN zGaQXNWLjV0XVf8}si886uFH?FCH2C;B!Is&OrBXs75} z2HbpnJ|R4L!AZO%s@ZB`y}BUWUNG&guM%&{@B}MXh?0(^IONKdx0wPCcJ{)1;uvdN z*#)Y^TaF+WBhByS3a3SOtL4vv@RdX%au%gF*iVuvVe+*dX$b^(I+hTxE4gDmG9}U8 zYb`>)e2$iPr!)uo9VrhnU)TCNi4$HxIPCJ?b(!i7RHqjt{`#uM=$?S@`#nF=Akg~3 ztPIUI^Nc~IU;z>nYglrwb*Z#Lkfl7VlGU)1o;@Khe;_km#D+3!J*6c{WTbd z9d@%Q3L^AO<5>^aY4k5(p+@k&N97YqvZT_RV80k?{QWfb5NB|J2XrXR??(MT;$Tb} znDXrPEI zlB_Ik%$Swz;Rvn8#1TPRFgU%0~H5S=AQ|aFdypbwS8uz+}$#4mM*er z=HnSk>G(LOFZxxQ=iXBZExx|FwAP}umRXsj)h`cQHY&$lOS>X?@3dWUw9)v&*psEX z`K9^Fr6&>3hB~XOS92rE%V(DR0}YEB8uj6xGZW(%KR?gZ6E)Xwk9R7|i&dg-&vWnO z&(W=fbK}aY!R4=lWD7z)9IV0W1%@MGo*civl(92gYt{9dGNTAy1lC$ofRt41{rRQM zz!RH0?2(kw+0LHtcMO=@m8nF3u~R@z|`( z%jUhImrz4uD!)P~J6L1?uGHLt*2g9d!8sT`ci5`UD?Qxt(3FIQ_K!2^QTlwfnDY~~ zo7@;YkMbnbCP)wGuct?5x?AY)%-9BN`z{&&T0XVAcBW;m8SNyH9e0AYBgPNg+ifIO zKY2v(!?G!@0&IQ6ZYwuaX&meeIr!l?*55{9T4gEiPz?K^7BO_%;pftxmFhajYDh_^d zST)yD5YYDRH`EDxq#bxH`pOVwL2H8cqoFJ}Zp`IQZ-O$rBL;Q33y6$xyWNmoz6+#B z0{+GGwtoYo`b?F}xbyV9#L(**n9j3C83~Hiov?_Mg!3KgQD4cmsSoOGTScGyHK+Zq z^ON3%`(0n>aXY-n=N!TUMTFbX2;xU|N0w|VzOGzj;jI+Os!L`GeG|ngX>fuk--EdQ zM1Rx#RG1g*`DTcG^6p}E#^egqJGCTexpE+DlD@aHstuK(*wYVb``Q$yCsg1nm{PYv zhdY_x!MAfUV>^=f8(DQ{310~-p)2X~^OLTz9GpBA8X_>CDuSPmWMYt|J1{XPJS@6y zn9O3;9hpw9_;H`{jd*jlf$!%U$8Z)GXsWXZ4RSEpa3MZ)tp|Zf$7Uy_#jAT=dOFJU zdcGhgP4&mA!>k?gBHF2!58-%xn^u z#wfO%<{H<)aW$wGTAA4;tdlnHQSyz!&!H#c z6)8Em*IXh=eAM{{%<4nz7bg$c8LKCeZg7jvyn+~~ovqQyJ^!q+ojYo%M4X#`jKfKT zD?)BMy_C7d`B9bC3h}#%nDQ>egCnZrbRS;a>Z)}>Sa1}3+hYugyM{{+*iq3~?VSgiQp6zC}ads~(+JSNm-;(zZoUu})n%ysI6TH6GpE2QDUj+`?s8w%#&qN9wRbCL3 z%2Y>3F8ng#qA4=4AMwlde(J8(k6U#|aC#lBlrPtLAxbE+n7xoaEV;!6;xg1e8uu=) z_N-phFOS{LEjRK0Z$=&Gu>Bp$?`c=1ia5yRme|@Wqzu=3DM)~Ow|H8BM-KKg%|ULO zsC=0%f=Wk3UdRYK%^x7CCpe1R)fJw$ZDpYblLsCE7uJHW^Y2ga7EGQf zaHFUt;2)SP-jFMa(E^W(X^!xXWi`HutO1WTBzArePCNP9RRWS5g~KclG-c&0b6ZV& zhVnipZoR1DxdlddzG-lDCCA&x%2&BM9pkur<}|D@d8__=vmAWgSMu0udcZCvk-g`7 z0iCDMt|6lR5$hX)vt7Y3v>GD&T9z6gqF*;s`K8k7-pelxKWI+0CaNs&Xc(P zy6D(0XKwriiB1+2U1I0m3}zhd{jT^k`cAZPloCpy!v9P z*E;c;By`Kw-TuvF!f@n|+6!}ym z-U9bW<8r0V$G64zI$fvw`y?y&Y*;~vARv%#nNA$L0qZ$kr-d7meaV4KfI25x*TE|5V)nwp}{mTFgxdT5J>0N@|`yXgmx^fT^A=;>rkIzy{?&?*H}M1 zS`7INc;jGS%}roDU~i;DQ&oo~QxL+e9xasR^!Lg=u2^4&1D-`3&YH^_Rl5;JY8CZO zo=8^f^}f80E{E6rZD#~8Xn24#@Atm9l^@#IUliPF59;o|cJ5!Q?T<=<4=zccM)KEO z!Caf+SQ>u(d(??Pr2iTwvnA-AeaB}fevO^&RE3p*Vg5}(EHvq217BZre;!$D9=(_% zGdg!f;}WdiB|HLtP@|UA6?rqIB|hQ&@n<}vmrTKWO+={z+Scr;q+^{jKdH;t420C@ zs+LcV&(Tw}Uzq~suX>^2+50{j)|xrWY}DciPcq%~Wsvbh)vTT`L`L;&6!)acvH&&$ z6B>B{FbIbUhrn&7AwR@@B`YrJM^;X6YrHNB=5zBy@t|=U2sHG#{#(sq!sgqLn8!0$ zfZOk5!u<&GUjd>%g+kKCR5w@6HpWU_ca-*18x$r&t{n@sYa7r%$6EZ@cH#1f@5r$-lEM*Tp4QU>DX?y&;dDx_C)8S7PR*vPsql z(s;n z$j1r4LxisiC9F`QQGixh#6|;(x@d}qxZM<4I*#q7O?lbSYNaRJO57`TdF_t?S@B?< z{UBIwOeg0PcXrkds;EYsEDvbeExAOJKE&&TR=30vSv1iokz+*4{s;mN$sf9ENpap^ zR=@bS5vmCe368ec&`2cBx;P)5`j%T&5p$|Ql9PBBP&`QEpx|dNMuvKVUMOM9b)1IT zHsZ6xwQ+*pIJ(LxIepyMybNxU6sJ>@QL>FvQVIWPql%x6?T8aa?F~$-?0vwXnbo65 zwp|GG*~RIl4_)31%>zhzw#^5_zvQh-1YHuBXKMo-=sX%j&9iwq2n z0~YiAfK*r>7~=A3;jW8o7(I{Dx$aZ(_7!|Ug6;%6ety$-k(+_IkF)GVPS8F-)2UwW zk}V-UxBasq>s-I| z3|ru+e@QTRxr2Tc)Mh|FMb8hL`#*>{Zq&$_x-f5qw*j4S5G) z5?5Wv(+rJ60J#^~X^yBe6{IY!+w~9hVWYYRP)M78L-^CfHGw0KbBz@t35p&GvdmQmx z;&8*i9_K_U0LlWwz4=RvpupwF+rmonXqALWU|aEv(FQ2#&Q=I>aVk;Crk-qg@rjX$ z+PG`SMIE2Wy_r+_IxZpX0JG=er>2Fzyat4zufus&q-B7Xj0!5Ipn7W9!1FI zl0>ie7d+co$RSh`-a7@Vd$goGWIkW!w4iYK>FX-IL^}NGoFtzQZ<)67fLRI42r08{T0HhO3|0lk+4Jv8d^^~CeOSm@SY4vKh>TLGF zsn-RLO!r{RD63+55SwE$xGQ5Yi;Ntz76;0p4+TI<&PY_;K1q$me0$f*$lAy=vj(xa zJ~JQ67O6(kUKeO1ZlH1}?fu=pe?6xua6-qxYesg@K#R=}U@&H8Q9 zNGhJFJS!5O{uDu22?%<0IY3zH&U@Y57;ny!z$AqqBXeFOHr2zpQcs|Gzs`*Nm$;{z zW(=sOpA_d9EA6lu=S*jvA=}1*a`8PPD9Id;Tv#^MPkS?ozg&~@|~ZR z_bE25o@Z{%AoeGn`?XIVS5$VYakdzY9VD+H1#X}w9O6!Hs@Q*G+6DuCX!zfK z=tO~_-%F!699$sX?M1giw+#Org7WljMR_zNf&UNo&wOj%5Yg;*=NC|5NrdhK`a=PQ@91bhP61eIGTs zYg)%D{Tu;QBF%F5oqX=c1Q@4BEf5X9(u>^h_?N;V^rvE)mkJ4uXMeU#1Dz-#SUsc` z2>rk>zaqMrI1mw$cG+mMXV?{}#yh9_*>ShURa@R}1G24k4Fk_8hVD|BXUJJMQOOoD19|rQHg3aUaSH zgEDoSkctIVZdt`~lLSrQKrW!#(Hi>z`{`>bD=UsSjS3Hl^Ms`Z3q!euxGXQuzXJb$ zdR<%NDCiFoNrHlSr!r$Ar{4RvH=jv~;2uGRB4)xJ&Wy*baOZJh#vR=zUy)IQPp*J)jv1kYLjlrrT+ zk|G{3+V847L*24#)D6h#p+5s-q1`i6&87epDB`_r51}yO0OvGquI=*l2y&EY7z@@N>mtc-cifmT(xABA?X2b^c=1Nz%37LQrzowuc|BPq{0lLJy$=JfL|^ zWwCP=wW`k>9@$>(@@OEfqPgnUVAv=loE-huf_M<^jzK*-A`sKNH)9f$oSj|iPJ98Mm+Co zlfXnZEh3Fd6RU_PiKqreYk8X3Gg)9mZ7*{D#ye|8mVhIb+P8bVGgl7}Un1^vX1bpJ zwkp^q`5bpG(d2Srn=m5VyiYN6jzz67YK)yVbg_@+LpMQ`GW#X=|1xN1Z`N~^^60w> zW&y;5K&$`^&4o=p%5w(dk(y#2ac1eAj$8F)jvU0Jj)Ki){<{s_N1et7vbyBnh|GVQ zpxB^iXwQ4pQzJ|LD{8FlJ{q>q(-Y7!^|6KlR;5jDx434H=*3nPBFZAU`KRbIwJU{cIfKoy4}5OgSB80?v&kxg1l1ho&OoA|vB zS+2zdM@8I~+zH%2eWSK<{x+#mf6zexqT#ZVJ5@^OXn=ZWVIdCW_l?o*ldZR5fBQ;NTm@aB3~$_f@WHxv zIWACn>ilMAcZas(NZ}x}Jccxnw3th2BR9XIXNY2<{&vA&7kKS(0_`=)%l-k$^TMBX h6UP*tZT)wI*q7|24^&+a0FER<=B8FAm4CY5`!8flbeaGF diff --git a/Assets/UI/Theme.tres b/Assets/UI/Theme.tres index 1de8275..bcc0b28 100644 --- a/Assets/UI/Theme.tres +++ b/Assets/UI/Theme.tres @@ -41,7 +41,7 @@ [ext_resource type="StyleBox" uid="uid://0jfr1uwuog0s" path="res://Assets/UI/Slider/v/background.tres" id="39_dl1e4"] [ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="40_bmcvq"] -[sub_resource type="Image" id="Image_cw2pn"] +[sub_resource type="Image" id="Image_4kppd"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0), "format": "RGBA8", @@ -51,7 +51,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_g5bup"] -image = SubResource("Image_cw2pn") +image = SubResource("Image_4kppd") [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_sj7h5"] diff --git a/Scenes/Main Menu.tscn b/Scenes/Main Menu.tscn index 0c7bb4f..f019bd7 100644 --- a/Scenes/Main Menu.tscn +++ b/Scenes/Main Menu.tscn @@ -1,20 +1,63 @@ -[gd_scene load_steps=25 format=3 uid="uid://cukyb513fah1u"] +[gd_scene load_steps=28 format=3 uid="uid://cukyb513fah1u"] [ext_resource type="Script" path="res://Scripts/UI/MainMenuManager.gd" id="1_qepq0"] [ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png" id="2_8o6th"] [ext_resource type="PackedScene" uid="uid://c4btepmue6d7p" path="res://Scenes/Game.tscn" id="2_28004"] -[ext_resource type="Texture2D" uid="uid://daat37cyg0go5" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png" id="3_1e3fe"] [ext_resource type="PackedScene" uid="uid://cbfcolm6mjolp" path="res://Prefabs/Settings Menu.tscn" id="3_r3r61"] [ext_resource type="Theme" uid="uid://babphdknr2kkd" path="res://Assets/UI/Theme.tres" id="4_bmt8e"] -[ext_resource type="Texture2D" uid="uid://c3yg6u8yncau3" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png" id="6_45o7d"] -[ext_resource type="Texture2D" uid="uid://dkotcqflp3e32" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png" id="7_285vd"] [ext_resource type="Texture2D" uid="uid://ojlfqxj5bilo" path="res://Assets/Sprites/Jesus/jesus_spritesheet.png" id="7_g28i1"] +[ext_resource type="Texture2D" uid="uid://dlr823rtwhtq2" path="res://Assets/Sprites/EasterEgg.png" id="7_wokip"] +[ext_resource type="Texture2D" uid="uid://c54k7fn4fu42s" path="res://Assets/Sprites/Bunny/good_bunny_spritesheet.png" id="8_5vrmg"] [ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="10_seibg"] [ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/Music/omw-to-beat-the-big-bad.wav" id="12_i62fw"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5uvie"] bg_color = Color(0.439216, 0.631373, 0.537255, 1) +[sub_resource type="Animation" id="Animation_iq7o3"] +resource_name = "Walk" +length = 0.8 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1), +"update": 1, +"values": [0, 1, 2, 3, 4, 5, 6, 7] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_xufdy"] +_data = { +"Autostart": SubResource("Animation_iq7o3") +} + +[sub_resource type="Animation" id="Animation_53kbk"] +resource_name = "Autostart" +length = 0.2 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), +"update": 1, +"values": [0, 1, 2, 3, 4] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_5tgwk"] +_data = { +"Autostart": SubResource("Animation_53kbk") +} + [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rmi2t"] bg_color = Color(0.427451, 0.423529, 0.8, 1) border_width_left = 4 @@ -126,6 +169,7 @@ script = ExtResource("1_qepq0") game_scene = ExtResource("2_28004") settings_scene = ExtResource("3_r3r61") default_focus = NodePath("MainVBox/ButtonsVbox/PlayButton") +autostart_animations = Array[NodePath]([NodePath("Decorations/Left Decor/Jesus/AnimationPlayer")]) [node name="ColorRect" type="Panel" parent="."] anchors_preset = 15 @@ -163,10 +207,24 @@ texture = ExtResource("7_g28i1") hframes = 8 vframes = 4 -[node name="Egg3" type="Sprite2D" parent="Decorations/Left Decor"] -position = Vector2(132, 530) -scale = Vector2(4.6875, 4.625) -texture = ExtResource("3_1e3fe") +[node name="AnimationPlayer" type="AnimationPlayer" parent="Decorations/Left Decor/Jesus"] +libraries = { +"": SubResource("AnimationLibrary_xufdy") +} + +[node name="EasterEgg" type="Sprite2D" parent="Decorations/Left Decor"] +position = Vector2(137, 503) +scale = Vector2(4.97917, 4.97917) +texture = ExtResource("7_wokip") +hframes = 6 + +[node name="EasterEgg2" type="Sprite2D" parent="Decorations/Left Decor"] +position = Vector2(312, 528) +rotation = 1.33289 +scale = Vector2(4.09073, 4.29567) +texture = ExtResource("7_wokip") +hframes = 6 +frame = 4 [node name="Right Decor" type="CenterContainer" parent="Decorations"] custom_minimum_size = Vector2(576, 0) @@ -183,21 +241,24 @@ position = Vector2(351, 403) scale = Vector2(19.0938, 11.8125) texture = ExtResource("2_8o6th") -[node name="Egg2" type="Sprite2D" parent="Decorations/Right Decor"] -position = Vector2(294, 487) -rotation = -1.5708 -scale = Vector2(4.89203, 5.21732) -texture = ExtResource("6_45o7d") - -[node name="Egg1" type="Sprite2D" parent="Decorations/Right Decor"] -position = Vector2(420.75, 471.25) -scale = Vector2(4.89062, 4.95313) -texture = ExtResource("7_285vd") - [node name="GoodBunny" type="Sprite2D" parent="Decorations/Right Decor"] -position = Vector2(331, 458.5) +position = Vector2(388, 471.5) scale = Vector2(7.14286, 7.02941) +texture = ExtResource("8_5vrmg") +hframes = 5 +vframes = 4 + +[node name="AnimationPlayer" type="AnimationPlayer" parent="Decorations/Right Decor/GoodBunny"] +libraries = { +"": SubResource("AnimationLibrary_5tgwk") +} + +[node name="EasterEgg" type="Sprite2D" parent="Decorations/Right Decor"] +position = Vector2(298.625, 516.969) +scale = Vector2(4.11458, 4.11458) +texture = ExtResource("7_wokip") hframes = 6 +frame = 2 [node name="MainVBox" type="VBoxContainer" parent="."] anchors_preset = 15 diff --git a/Scripts/UI/MainMenuManager.gd b/Scripts/UI/MainMenuManager.gd index 6d2cc53..93f573d 100644 --- a/Scripts/UI/MainMenuManager.gd +++ b/Scripts/UI/MainMenuManager.gd @@ -3,6 +3,7 @@ extends Node @export var game_scene : Resource @export var settings_scene : Resource @export var default_focus : Control +@export var autostart_animations : Array[NodePath] # Engine Callbackss func _ready(): @@ -14,6 +15,8 @@ func _ready(): GlobalSettings.update_music_volume(Save.game_data.music_volume) GlobalSettings.update_sfx_volume(Save.game_data.sfx_volume) default_focus.grab_focus() + for animation in autostart_animations: + (get_node(animation) as AnimationPlayer).play("Autostart") pass func _on_play_button_pressed(): diff --git a/Scripts/UI/Remaping/RemapController.gd b/Scripts/UI/Remaping/RemapController.gd index e907185..b091f86 100644 --- a/Scripts/UI/Remaping/RemapController.gd +++ b/Scripts/UI/Remaping/RemapController.gd @@ -1,6 +1,6 @@ extends Control -@export var min_time_between_remaps := 0.1 +@export var min_time_between_remaps := 0.4 var remap_button : Button var remap_action : String From 79f6f4350278a0bd4438af8c9501b161b4152c52 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 11 Apr 2023 16:54:04 +0200 Subject: [PATCH 17/26] Fixing up all the stuff about UI --- .../Start Menu Old/Easter Egg/Egg 1.png | Bin 522 -> 0 bytes .../Easter Egg/Egg 1.png.import | 34 -- .../Start Menu Old/Easter Egg/Egg 2.png | Bin 470 -> 0 bytes .../Easter Egg/Egg 2.png.import | 34 -- .../Start Menu Old/Easter Egg/Egg 3.png | Bin 445 -> 0 bytes .../Easter Egg/Egg 3.png.import | 34 -- .../Start Menu Old/Easter Egg/Shadow.png | Bin 145 -> 0 bytes Assets/Sprites/{GUI => UI}/Heart.png | Bin Assets/Sprites/{GUI => UI}/Heart.png.import | 6 +- Assets/Sprites/UI/Shadow.png | Bin 0 -> 184 bytes .../Easter Egg => UI}/Shadow.png.import | 6 +- Assets/UI/Theme.tres | 8 +- Prefabs/Settings Menu.tscn | 369 ++++++++++-------- Scenes/Main Menu.tscn | 254 +++++------- Scripts/SaveSystem/GlobalSettings.gd | 1 + Scripts/UI/MainMenuManager.gd | 1 + Scripts/UI/SettingsMenu.gd | 3 +- project.godot | 6 +- 18 files changed, 325 insertions(+), 431 deletions(-) delete mode 100644 Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png delete mode 100644 Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png.import delete mode 100644 Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png delete mode 100644 Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png.import delete mode 100644 Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png delete mode 100644 Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png.import delete mode 100644 Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png rename Assets/Sprites/{GUI => UI}/Heart.png (100%) rename Assets/Sprites/{GUI => UI}/Heart.png.import (72%) create mode 100644 Assets/Sprites/UI/Shadow.png rename Assets/Sprites/{Start Menu Old/Easter Egg => UI}/Shadow.png.import (70%) diff --git a/Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png b/Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png deleted file mode 100644 index 3943e7e2ca7f25652058713ff2e34c39689b93f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 522 zcmV+l0`>igP)Px$#7RU!R9Hvdm%U2FKoo^DzJtDo7J}Q0m5VmkHZE2+vWOt4VFkfLY^?lgtZn?O ze1R1d^fi2ltW3fgW>4nM&zdD-y4_6Xe)pU^Cq!k5*VgLc$oI(Y%ZWs)U39u-Na=Y!dYJXT!1BmTV1LW)TV~qL3ml)MNBNGGIox1>H zhxAtfT$ru$DZ#T)vw$~qW&TtFhMP-

y|E^VH>iqY5wpdzu2^3ng&|YycFul}H&v zy>{WOGbYgI{?L64u?l%Gi52$n0TcjS81=*?i~(>36^53(ZyZ31Tsv@V`I7-c$8l-^ zJPWbW%s{X}>RgPx$kV!;AR9Hu2WFQeFd)NNQr)BQeW=2wsBuO#I-~n?0%;G6)s_=R+C!`H5Pi#mK z9Re^1%-Pa}*8wR$b<}kLu@E8WK1|VAKHv76R0=nAo&{kp>7k z0F=E5l?B)e3S8NeBnQ9@0a-w*BPezN%zy@eeTIgO7r~w+#SsJ@01NtAn;IAx85zMC z29PZWiSatHG87k{A;}T{{`~{1PxEU)DXQVN5US-sK8FF213&Tu($`AfXflc(e?1~XAIAf?EvJ2 z2eSm5BS1F7qKj${fVmnu)#Gvma#|tF0k~Ql*s>hDBR(JajgnUIwOnu}LQ?WJ$O2?X zz#M?DoIo!RNGb_&`G}Z8ieNzmGn`OeK*$leN=TYJ02Up%qL3~Qz?bNVb^xVOf$j)G zt>eMlCPWVj7@tr!MX!Vi^^l0}7YvvK(BqU)wN1#!=;jd&0a`l%0ObHQFzTo}vH$=8 M07*qoM6N<$f>rFaQ2+n{ diff --git a/Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png.import b/Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png.import deleted file mode 100644 index 9d1176b..0000000 --- a/Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c3yg6u8yncau3" -path="res://.godot/imported/Egg 2.png-af579f6c406ae3454de989d8d70067ac.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png" -dest_files=["res://.godot/imported/Egg 2.png-af579f6c406ae3454de989d8d70067ac.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png b/Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png deleted file mode 100644 index afbbf1453ca0662dffa0ff2b0f1ad43dd979ad81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 445 zcmV;u0Yd(XP)Px$cS%G+R9Hvtm%VKQK@f$Z1xla+61u>W6E}cx=)@vJvULK943QApasy5*K^G)6 z;1b*dXis`*Jj~ys6H9Ox?(WR{c4lsNx7*45CZo5bW%9XObaPy0El!S$0YG^3Ju^4> z^0chyqmc+l001A`xe4(6@ZKyyRG3pmLEH!w1GrW=Hxgw+olXh2%K9B_b$ zfYS?$S%g{&=Uk|<{imAJ>Cl`{4M~{ n%>j6xi#<-YlyE>V=p}EA#*W diff --git a/Assets/Sprites/GUI/Heart.png b/Assets/Sprites/UI/Heart.png similarity index 100% rename from Assets/Sprites/GUI/Heart.png rename to Assets/Sprites/UI/Heart.png diff --git a/Assets/Sprites/GUI/Heart.png.import b/Assets/Sprites/UI/Heart.png.import similarity index 72% rename from Assets/Sprites/GUI/Heart.png.import rename to Assets/Sprites/UI/Heart.png.import index 409bc13..2a5d738 100644 --- a/Assets/Sprites/GUI/Heart.png.import +++ b/Assets/Sprites/UI/Heart.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://7j7ufllfyi0c" -path="res://.godot/imported/Heart.png-ebd7db14ae3fcb705890a9b88bc59e29.ctex" +path="res://.godot/imported/Heart.png-f9bbc38428c117b5a1733171680ae999.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/Sprites/GUI/Heart.png" -dest_files=["res://.godot/imported/Heart.png-ebd7db14ae3fcb705890a9b88bc59e29.ctex"] +source_file="res://Assets/Sprites/UI/Heart.png" +dest_files=["res://.godot/imported/Heart.png-f9bbc38428c117b5a1733171680ae999.ctex"] [params] diff --git a/Assets/Sprites/UI/Shadow.png b/Assets/Sprites/UI/Shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..5e1cd223d36718225569cd3f167d0a400ba1b116 GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^20$#p!3HD)*8SNCr0P9g978-hlT#Kjs8nD7x7@{^ z=gi$(XFS%$Eiwr@y>JOrl1*FiK?h4I@dHmKc@7?YR#4LLPS7HKgSCw80h>c74j6oq z;b$)1Zf0!67kd0K!(|8Sh9HAijg4&1_QHoPoX-kt9Mv$Acq4Z(a^k|~gUgTe~DWM4fWA{Q* literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png.import b/Assets/Sprites/UI/Shadow.png.import similarity index 70% rename from Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png.import rename to Assets/Sprites/UI/Shadow.png.import index cbbac7a..8ac75d2 100644 --- a/Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png.import +++ b/Assets/Sprites/UI/Shadow.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://tjxkew3m4v8m" -path="res://.godot/imported/Shadow.png-a5365acb462689cb9834499edb8acb8b.ctex" +path="res://.godot/imported/Shadow.png-f1189895bd40fd4a82339bf75c98a455.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png" -dest_files=["res://.godot/imported/Shadow.png-a5365acb462689cb9834499edb8acb8b.ctex"] +source_file="res://Assets/Sprites/UI/Shadow.png" +dest_files=["res://.godot/imported/Shadow.png-f1189895bd40fd4a82339bf75c98a455.ctex"] [params] diff --git a/Assets/UI/Theme.tres b/Assets/UI/Theme.tres index bcc0b28..4144fdf 100644 --- a/Assets/UI/Theme.tres +++ b/Assets/UI/Theme.tres @@ -41,7 +41,7 @@ [ext_resource type="StyleBox" uid="uid://0jfr1uwuog0s" path="res://Assets/UI/Slider/v/background.tres" id="39_dl1e4"] [ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="40_bmcvq"] -[sub_resource type="Image" id="Image_4kppd"] +[sub_resource type="Image" id="Image_avfxn"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0), "format": "RGBA8", @@ -51,7 +51,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_g5bup"] -image = SubResource("Image_4kppd") +image = SubResource("Image_avfxn") [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_sj7h5"] @@ -137,7 +137,7 @@ HSlider/styles/slider = ExtResource("19_ccnyp") Label/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) Label/colors/font_outline_color = Color(0.745098, 0.760784, 0.721569, 1) Label/colors/font_shadow_color = Color(0.745098, 0.760784, 0.721569, 1) -Label/constants/line_spacing = 3 +Label/constants/line_spacing = 8 Label/constants/outline_size = 0 Label/constants/shadow_offset_x = 0 Label/constants/shadow_offset_y = 4 @@ -177,7 +177,7 @@ ProgressBar/styles/background = ExtResource("23_r3p5f") ProgressBar/styles/fill = ExtResource("24_twflh") TabContainer/colors/font_selected_color = Color(0.941176, 0.964706, 0.909804, 1) TabContainer/colors/font_unselected_color = Color(0.941176, 0.964706, 0.909804, 1) -TabContainer/font_sizes/font_size = 16 +TabContainer/font_sizes/font_size = 48 TabContainer/icons/decrement = ExtResource("25_tp1la") TabContainer/icons/decrement_highlight = ExtResource("26_b6do7") TabContainer/icons/increment = ExtResource("27_apyeg") diff --git a/Prefabs/Settings Menu.tscn b/Prefabs/Settings Menu.tscn index 2d389da..53a3fc5 100644 --- a/Prefabs/Settings Menu.tscn +++ b/Prefabs/Settings Menu.tscn @@ -9,18 +9,18 @@ bg_color = Color(0.439216, 0.631373, 0.537255, 1) [node name="SettingsMenu" type="Node" node_paths=PackedStringArray("back_button", "tab_container", "bottom_item_video", "bottom_item_audio", "bottom_item_controls", "bottom_item_controls_gamepad", "display_options_button", "vsync_toggle", "resolutions_options_button", "master_volume_slider", "music_volume_slider", "sfx_volume_slider")] script = ExtResource("1_2rgd2") -back_button = NodePath("Back Button") -tab_container = NodePath("SettingsTabs") -bottom_item_video = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/ResolutionsOptions") -bottom_item_audio = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider") -bottom_item_controls = NodePath("SettingsTabs/Controls/MarginContainer/GridContainer/AttackRemapButton") -bottom_item_controls_gamepad = NodePath("SettingsTabs/Gamepad/MarginContainer/GridContainer/AttackRemapButton") -display_options_button = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/DisplayModeOptions") -vsync_toggle = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/VsyncButton") -resolutions_options_button = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/ResolutionsOptions") -master_volume_slider = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/MasterVolumeSlider") -music_volume_slider = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/MusicVolSlider") -sfx_volume_slider = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider") +back_button = NodePath("Panel/MarginContainer/VBoxContainer/MarginContainer/Back Button") +tab_container = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs") +bottom_item_video = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/ResolutionsOptions") +bottom_item_audio = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/SFXVolSlider") +bottom_item_controls = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/VBox/MarginContainer/GridContainer/AttackRemapButton") +bottom_item_controls_gamepad = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/AttackRemapButton") +display_options_button = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/DisplayModeOptions") +vsync_toggle = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/VsyncButton") +resolutions_options_button = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/ResolutionsOptions") +master_volume_slider = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MasterVolumeSlider") +music_volume_slider = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MusicVolSlider") +sfx_volume_slider = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/SFXVolSlider") [node name="Remap Controller" type="Control" parent="."] visible = false @@ -40,24 +40,43 @@ grow_horizontal = 2 grow_vertical = 2 theme_override_styles/panel = SubResource("StyleBoxFlat_02uod") -[node name="SettingsTabs" type="TabContainer" parent="."] -custom_minimum_size = Vector2(1050, 475) +[node name="MarginContainer" type="MarginContainer" parent="Panel"] +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -offset_left = 12.0 -offset_top = 12.0 -offset_right = -12.0 -offset_bottom = -109.0 grow_horizontal = 2 grow_vertical = 2 -theme_override_font_sizes/font_size = 29 +theme_override_constants/margin_left = 32 +theme_override_constants/margin_top = 32 +theme_override_constants/margin_right = 32 +theme_override_constants/margin_bottom = 32 -[node name="Video" type="VBoxContainer" parent="SettingsTabs"] +[node name="VBoxContainer" type="VBoxContainer" parent="Panel/MarginContainer"] layout_mode = 2 -focus_neighbor_left = NodePath("../Controls") -[node name="MarginContainer" type="MarginContainer" parent="SettingsTabs/Video"] +[node name="SettingsTabs" type="TabContainer" parent="Panel/MarginContainer/VBoxContainer"] +layout_mode = 2 +size_flags_vertical = 3 +tabs_rearrange_group = 0 + +[node name="Video" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs"] +layout_mode = 2 +theme_override_constants/margin_left = 4 +theme_override_constants/margin_top = 4 +theme_override_constants/margin_right = 4 +theme_override_constants/margin_bottom = 4 + +[node name="ScrollView" type="ScrollContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video"] +layout_mode = 2 + +[node name="VBox" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView"] +layout_mode = 2 +size_flags_horizontal = 3 +focus_neighbor_left = NodePath("../../../Audio/ScrollView/VBox") + +[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox"] +clip_contents = true custom_minimum_size = Vector2(0, 425) layout_mode = 2 theme_override_constants/margin_left = 25 @@ -65,19 +84,22 @@ theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="GridContainer" type="GridContainer" parent="SettingsTabs/Video/MarginContainer"] +[node name="GridContainer" type="GridContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer"] layout_mode = 2 -columns = 2 +columns = 3 -[node name="DisplayModeLabel" type="Label" parent="SettingsTabs/Video/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="DisplayModeLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Display Mode" -vertical_alignment = 1 -[node name="DisplayModeOptions" type="OptionButton" parent="SettingsTabs/Video/MarginContainer/GridContainer"] +[node name="Spacer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 + +[node name="DisplayModeOptions" type="OptionButton" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] +layout_mode = 2 +text_overrun_behavior = 1 +clip_text = true item_count = 5 selected = 0 popup/item_0/text = "Full-Screen" @@ -91,286 +113,327 @@ popup/item_3/id = 3 popup/item_4/text = "Exclusive Full-Screen" popup/item_4/id = 4 -[node name="VSync Label" type="Label" parent="SettingsTabs/Video/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="VSync Label" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "VSync " -vertical_alignment = 1 -[node name="VsyncButton" type="CheckButton" parent="SettingsTabs/Video/MarginContainer/GridContainer"] +[node name="Spacer2" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 + +[node name="VsyncButton" type="CheckButton" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] +layout_mode = 2 text = "Vsync" -[node name="ResolutionsLabel" type="Label" parent="SettingsTabs/Video/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="ResolutionsLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Resolutions " -vertical_alignment = 1 -[node name="ResolutionsOptions" type="OptionButton" parent="SettingsTabs/Video/MarginContainer/GridContainer"] +[node name="Spacer3" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 -focus_neighbor_bottom = NodePath("../../../../../Back Button") + +[node name="ResolutionsOptions" type="OptionButton" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] +layout_mode = 2 +focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") fit_to_longest_item = false -[node name="Audio" type="VBoxContainer" parent="SettingsTabs"] +[node name="Audio" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs"] visible = false layout_mode = 2 +theme_override_constants/margin_left = 4 +theme_override_constants/margin_top = 4 +theme_override_constants/margin_right = 4 +theme_override_constants/margin_bottom = 4 -[node name="MarginContainer" type="MarginContainer" parent="SettingsTabs/Audio"] -custom_minimum_size = Vector2(0, 425) +[node name="ScrollView" type="ScrollContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio"] +layout_mode = 2 + +[node name="VBox" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox"] layout_mode = 2 theme_override_constants/margin_left = 25 theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="GridContainer" type="GridContainer" parent="SettingsTabs/Audio/MarginContainer"] +[node name="GridContainer" type="GridContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer"] layout_mode = 2 columns = 2 -[node name="MasterVolLabel" type="Label" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MasterVolLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Master Volume " -vertical_alignment = 1 -[node name="MasterVolumeSlider" type="HSlider" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] +[node name="MasterVolumeSlider" type="HSlider" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 min_value = -72.0 max_value = 0.0 -[node name="MusicVolLabel" type="Label" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MusicVolLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Music Volume " -vertical_alignment = 1 -[node name="MusicVolSlider" type="HSlider" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] +[node name="MusicVolSlider" type="HSlider" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 min_value = -72.0 max_value = 0.0 -[node name="SFXVolLabel" type="Label" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="SFXVolLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "SFX Volume" -vertical_alignment = 1 -[node name="SFXVolSlider" type="HSlider" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(500, 40) +[node name="SFXVolSlider" type="HSlider" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 -focus_neighbor_bottom = NodePath("../../../../../Back Button") +focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") min_value = -72.0 max_value = 0.0 -[node name="Controls" type="VBoxContainer" parent="SettingsTabs"] +[node name="Controlls" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs"] visible = false layout_mode = 2 +theme_override_constants/margin_left = 4 +theme_override_constants/margin_top = 4 +theme_override_constants/margin_right = 4 +theme_override_constants/margin_bottom = 4 -[node name="MarginContainer" type="MarginContainer" parent="SettingsTabs/Controls"] -custom_minimum_size = Vector2(0, 425) +[node name="ScrollView" type="ScrollContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls"] +layout_mode = 2 + +[node name="VBox" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox"] layout_mode = 2 theme_override_constants/margin_left = 25 theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="GridContainer" type="GridContainer" parent="SettingsTabs/Controls/MarginContainer"] +[node name="GridContainer" type="GridContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer"] layout_mode = 2 -columns = 2 +columns = 3 -[node name="MoveUpLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MoveUpLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Move Up" -vertical_alignment = 1 -[node name="MoveUpRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="MoveUpRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 script = ExtResource("2_4asaa") input_action_name = "move_up" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveLeftLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MoveLeftLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Move Left" -vertical_alignment = 1 -[node name="MoveLeftRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer2" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="MoveLeftRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 size_flags_horizontal = 3 script = ExtResource("2_4asaa") input_action_name = "move_left" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveDownLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MoveDownLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Move Down" -vertical_alignment = 1 -[node name="MoveDownRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer3" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="MoveDownRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 size_flags_horizontal = 3 script = ExtResource("2_4asaa") input_action_name = "move_down" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveRightLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MoveRightLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Move RIght" -vertical_alignment = 1 -[node name="MoveRightRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer4" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 -focus_neighbor_bottom = NodePath("../../../../../Back Button") + +[node name="MoveRightRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +layout_mode = 2 +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") script = ExtResource("2_4asaa") input_action_name = "move_right" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="AttackLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="AttackLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 text = "Attack " -vertical_alignment = 1 -[node name="AttackRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer5" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 -focus_neighbor_bottom = NodePath("../../../../../Back Button") + +[node name="AttackRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +layout_mode = 2 +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") script = ExtResource("2_4asaa") input_action_name = "attack" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="Gamepad" type="VBoxContainer" parent="SettingsTabs"] +[node name="Gamepad" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs"] visible = false layout_mode = 2 +theme_override_constants/margin_left = 4 +theme_override_constants/margin_top = 4 +theme_override_constants/margin_right = 4 +theme_override_constants/margin_bottom = 4 -[node name="MarginContainer" type="MarginContainer" parent="SettingsTabs/Gamepad"] -custom_minimum_size = Vector2(0, 425) +[node name="ScrollView" type="ScrollContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad"] +layout_mode = 2 + +[node name="Vbox" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox"] layout_mode = 2 theme_override_constants/margin_left = 25 theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="GridContainer" type="GridContainer" parent="SettingsTabs/Gamepad/MarginContainer"] +[node name="GridContainer" type="GridContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer"] layout_mode = 2 -columns = 2 +columns = 3 -[node name="MoveUpLabel" type="Label" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MoveUpLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] layout_mode = 2 text = "Move Up" -vertical_alignment = 1 -[node name="MoveUpRemapButton" type="Button" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="MoveUpRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 script = ExtResource("2_4asaa") input_action_name = "move_up_controller" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveLeftLabel" type="Label" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MoveLeftLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] layout_mode = 2 text = "Move Left" -vertical_alignment = 1 -[node name="MoveLeftRemapButton" type="Button" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer2" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="MoveLeftRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 size_flags_horizontal = 3 script = ExtResource("2_4asaa") input_action_name = "move_left_controller" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveDownLabel" type="Label" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MoveDownLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] layout_mode = 2 text = "Move Down" -vertical_alignment = 1 -[node name="MoveDownRemapButton" type="Button" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer3" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="MoveDownRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 size_flags_horizontal = 3 script = ExtResource("2_4asaa") input_action_name = "move_down_controller" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveRightLabel" type="Label" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="MoveRightLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] layout_mode = 2 text = "Move RIght" -vertical_alignment = 1 -[node name="MoveRightRemapButton" type="Button" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer4" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 -focus_neighbor_bottom = NodePath("../../../../../Back Button") + +[node name="MoveRightRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +layout_mode = 2 +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") script = ExtResource("2_4asaa") input_action_name = "move_right_controller" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="AttackLabel" type="Label" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer"] -custom_minimum_size = Vector2(400, 40) +[node name="AttackLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] layout_mode = 2 text = "Attack " -vertical_alignment = 1 -[node name="AttackRemapButton" type="Button" parent="SettingsTabs/Gamepad/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="Spacer5" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] layout_mode = 2 size_flags_horizontal = 3 -focus_neighbor_bottom = NodePath("../../../../../Back Button") + +[node name="AttackRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +layout_mode = 2 +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") script = ExtResource("2_4asaa") input_action_name = "attack" -remap_controller = NodePath("../../../../../Remap Controller") +remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="Back Button" type="Button" parent="."] -custom_minimum_size = Vector2(500, 40) -anchors_preset = 7 -anchor_left = 0.5 -anchor_top = 1.0 -anchor_right = 0.5 -anchor_bottom = 1.0 -offset_left = -250.0 -offset_top = -80.0 -offset_right = 250.0 -offset_bottom = -40.0 -grow_horizontal = 2 -grow_vertical = 0 -theme_override_font_sizes/font_size = 23 +[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer"] +layout_mode = 2 +theme_override_constants/margin_top = 32 + +[node name="Back Button" type="Button" parent="Panel/MarginContainer/VBoxContainer/MarginContainer"] +layout_mode = 2 +theme_override_font_sizes/font_size = 64 text = "Back" -[connection signal="item_selected" from="SettingsTabs/Video/MarginContainer/GridContainer/DisplayModeOptions" to="." method="_on_display_mode_options_item_selected"] -[connection signal="toggled" from="SettingsTabs/Video/MarginContainer/GridContainer/VsyncButton" to="." method="_on_vsync_button_toggled"] -[connection signal="item_selected" from="SettingsTabs/Video/MarginContainer/GridContainer/ResolutionsOptions" to="." method="_on_resolutions_options_item_selected"] -[connection signal="drag_ended" from="SettingsTabs/Audio/MarginContainer/GridContainer/MasterVolumeSlider" to="." method="_on_master_volume_slider_drag_ended"] -[connection signal="value_changed" from="SettingsTabs/Audio/MarginContainer/GridContainer/MasterVolumeSlider" to="." method="_on_master_volume_slider_value_changed"] -[connection signal="drag_ended" from="SettingsTabs/Audio/MarginContainer/GridContainer/MusicVolSlider" to="." method="_on_music_vol_slider_drag_ended"] -[connection signal="value_changed" from="SettingsTabs/Audio/MarginContainer/GridContainer/MusicVolSlider" to="." method="_on_music_vol_slider_value_changed"] -[connection signal="drag_ended" from="SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider" to="." method="_on_sfx_vol_slider_drag_ended"] -[connection signal="value_changed" from="SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider" to="." method="_on_sfx_vol_slider_value_changed"] -[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveUpRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveUpRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveLeftRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveLeftRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveDownRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveDownRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveRightRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveRightRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/AttackRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/AttackRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveUpRemapButton" to="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveUpRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveLeftRemapButton" to="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveLeftRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveDownRemapButton" to="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveDownRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveRightRemapButton" to="SettingsTabs/Gamepad/MarginContainer/GridContainer/MoveRightRemapButton" method="_on_pressed"] -[connection signal="pressed" from="SettingsTabs/Gamepad/MarginContainer/GridContainer/AttackRemapButton" to="SettingsTabs/Gamepad/MarginContainer/GridContainer/AttackRemapButton" method="_on_pressed"] -[connection signal="pressed" from="Back Button" to="." method="_on_back_pressed"] +[connection signal="item_selected" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/DisplayModeOptions" to="." method="_on_display_mode_options_item_selected"] +[connection signal="toggled" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/VsyncButton" to="." method="_on_vsync_button_toggled"] +[connection signal="item_selected" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/ResolutionsOptions" to="." method="_on_resolutions_options_item_selected"] +[connection signal="drag_ended" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MasterVolumeSlider" to="." method="_on_master_volume_slider_drag_ended"] +[connection signal="value_changed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MasterVolumeSlider" to="." method="_on_master_volume_slider_value_changed"] +[connection signal="drag_ended" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MusicVolSlider" to="." method="_on_music_vol_slider_drag_ended"] +[connection signal="value_changed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MusicVolSlider" to="." method="_on_music_vol_slider_value_changed"] +[connection signal="drag_ended" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/SFXVolSlider" to="." method="_on_sfx_vol_slider_drag_ended"] +[connection signal="value_changed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/SFXVolSlider" to="." method="_on_sfx_vol_slider_value_changed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveUpRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveUpRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveLeftRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveLeftRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveDownRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveDownRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveRightRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveRightRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/AttackRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/AttackRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveUpRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveUpRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveLeftRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveLeftRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveDownRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveDownRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveRightRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveRightRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/AttackRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/AttackRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/MarginContainer/Back Button" to="." method="_on_back_pressed"] diff --git a/Scenes/Main Menu.tscn b/Scenes/Main Menu.tscn index f019bd7..cdeaa31 100644 --- a/Scenes/Main Menu.tscn +++ b/Scenes/Main Menu.tscn @@ -1,14 +1,13 @@ -[gd_scene load_steps=28 format=3 uid="uid://cukyb513fah1u"] +[gd_scene load_steps=16 format=3 uid="uid://cukyb513fah1u"] [ext_resource type="Script" path="res://Scripts/UI/MainMenuManager.gd" id="1_qepq0"] -[ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png" id="2_8o6th"] [ext_resource type="PackedScene" uid="uid://c4btepmue6d7p" path="res://Scenes/Game.tscn" id="2_28004"] [ext_resource type="PackedScene" uid="uid://cbfcolm6mjolp" path="res://Prefabs/Settings Menu.tscn" id="3_r3r61"] [ext_resource type="Theme" uid="uid://babphdknr2kkd" path="res://Assets/UI/Theme.tres" id="4_bmt8e"] +[ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/UI/Shadow.png" id="5_wt601"] [ext_resource type="Texture2D" uid="uid://ojlfqxj5bilo" path="res://Assets/Sprites/Jesus/jesus_spritesheet.png" id="7_g28i1"] [ext_resource type="Texture2D" uid="uid://dlr823rtwhtq2" path="res://Assets/Sprites/EasterEgg.png" id="7_wokip"] [ext_resource type="Texture2D" uid="uid://c54k7fn4fu42s" path="res://Assets/Sprites/Bunny/good_bunny_spritesheet.png" id="8_5vrmg"] -[ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="10_seibg"] [ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/Music/omw-to-beat-the-big-bad.wav" id="12_i62fw"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5uvie"] @@ -38,7 +37,7 @@ _data = { [sub_resource type="Animation" id="Animation_53kbk"] resource_name = "Autostart" -length = 0.2 +length = 0.5 loop_mode = 1 tracks/0/type = "value" tracks/0/imported = false @@ -58,120 +57,26 @@ _data = { "Autostart": SubResource("Animation_53kbk") } -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rmi2t"] -bg_color = Color(0.427451, 0.423529, 0.8, 1) -border_width_left = 4 -border_width_top = 4 -border_width_right = 4 -border_width_bottom = 4 -border_color = Color(0, 0, 0, 1) -expand_margin_left = 7.0 -expand_margin_right = 7.0 +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_h5db4"] +bg_color = Color(0, 0, 0, 0.156863) -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_47cud"] -bg_color = Color(0.427451, 0.423529, 0.8, 1) -border_width_left = 4 -border_width_bottom = 4 -border_color = Color(0.317647, 0.301961, 0.658824, 1) -corner_radius_top_left = 2 -corner_radius_bottom_right = 2 -expand_margin_left = 7.0 -expand_margin_right = 7.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2i81h"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) -border_width_left = 4 -border_width_bottom = 4 -border_color = Color(0.262745, 0.243137, 0.556863, 1) -corner_radius_top_left = 2 -corner_radius_bottom_right = 2 -expand_margin_left = 10.0 -expand_margin_right = 10.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_vel2s"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) -expand_margin_left = 7.0 -expand_margin_right = 7.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7k6ml"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) -expand_margin_right = 10.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_11k4d"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_nyi0q"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_qky0m"] -bg_color = Color(0.313726, 0.231373, 0.4, 1) -border_width_left = 4 -border_width_top = 4 -border_width_right = 4 -border_width_bottom = 4 -border_color = Color(0.313726, 0.231373, 0.4, 1) -corner_radius_top_left = 2 -corner_radius_top_right = 2 -corner_radius_bottom_right = 2 -corner_radius_bottom_left = 2 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lleuj"] -bg_color = Color(0.941176, 0.964706, 0.909804, 1) -border_width_left = 5 -border_width_top = 5 -border_width_right = 5 -border_width_bottom = 5 -border_color = Color(0.65098, 0.741176, 0.509804, 1) -corner_radius_top_left = 5 -corner_radius_top_right = 5 -corner_radius_bottom_right = 5 -corner_radius_bottom_left = 5 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rcukk"] -bg_color = Color(0.941176, 0.964706, 0.909804, 1) -border_width_left = 3 -border_width_top = 3 -border_width_right = 3 -border_color = Color(0.658824, 0.74902, 0.517647, 1) -expand_margin_left = 5.0 -expand_margin_top = 5.0 -expand_margin_right = 5.0 -expand_margin_bottom = 5.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_44exv"] -bg_color = Color(0.894118, 0.94902, 0.835294, 1) -border_width_left = 4 -border_width_top = 4 -border_width_right = 4 -border_color = Color(0.635294, 0.756863, 0.482353, 1) -expand_margin_left = 4.0 -expand_margin_top = 4.0 -expand_margin_right = 4.0 - -[sub_resource type="Theme" id="Theme_w723v"] -default_font = ExtResource("10_seibg") -Button/styles/focus = SubResource("StyleBoxFlat_rmi2t") -Button/styles/hover = SubResource("StyleBoxFlat_47cud") -Button/styles/normal = SubResource("StyleBoxFlat_2i81h") -Button/styles/pressed = SubResource("StyleBoxFlat_vel2s") -CheckButton/styles/hover_pressed = SubResource("StyleBoxFlat_7k6ml") -HSlider/styles/grabber_area = SubResource("StyleBoxFlat_11k4d") -HSlider/styles/grabber_area_highlight = SubResource("StyleBoxFlat_nyi0q") -HSlider/styles/slider = SubResource("StyleBoxFlat_qky0m") -TabContainer/colors/font_selected_color = Color(0.0980392, 0.0980392, 0.0980392, 1) -TabContainer/colors/font_unselected_color = Color(0.435294, 0.435294, 0.435294, 1) -TabContainer/styles/panel = SubResource("StyleBoxFlat_lleuj") -TabContainer/styles/tab_selected = SubResource("StyleBoxFlat_rcukk") -TabContainer/styles/tab_unselected = SubResource("StyleBoxFlat_44exv") - -[node name="MainMenu" type="Node" node_paths=PackedStringArray("default_focus")] +[node name="MainMenu" type="Control" node_paths=PackedStringArray("default_focus")] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 6 +size_flags_vertical = 3 script = ExtResource("1_qepq0") game_scene = ExtResource("2_28004") settings_scene = ExtResource("3_r3r61") -default_focus = NodePath("MainVBox/ButtonsVbox/PlayButton") -autostart_animations = Array[NodePath]([NodePath("Decorations/Left Decor/Jesus/AnimationPlayer")]) +default_focus = NodePath("VBoxContainer/MarginBox2/ButtonsVbox/PlayButton") +autostart_animations = Array[NodePath]([NodePath("Decorations/Left Decor/Jesus/AnimationPlayer"), NodePath("Decorations/Right Decor/GoodBunny/AnimationPlayer")]) -[node name="ColorRect" type="Panel" parent="."] +[node name="Panel" type="Panel" parent="."] +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -181,7 +86,7 @@ theme = ExtResource("4_bmt8e") theme_override_styles/panel = SubResource("StyleBoxFlat_5uvie") [node name="Decorations" type="Control" parent="."] -layout_mode = 3 +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -196,13 +101,13 @@ anchor_bottom = 1.0 grow_vertical = 2 [node name="Shadow" type="Sprite2D" parent="Decorations/Left Decor"] -position = Vector2(226.563, 338.875) -scale = Vector2(22.7773, 15.6953) -texture = ExtResource("2_8o6th") +position = Vector2(272, 686) +scale = Vector2(10, 10) +texture = ExtResource("5_wt601") [node name="Jesus" type="Sprite2D" parent="Decorations/Left Decor"] -position = Vector2(231.625, 327.793) -scale = Vector2(8.16379, 8.16379) +position = Vector2(279, 408) +scale = Vector2(10, 10) texture = ExtResource("7_g28i1") hframes = 8 vframes = 4 @@ -213,15 +118,15 @@ libraries = { } [node name="EasterEgg" type="Sprite2D" parent="Decorations/Left Decor"] -position = Vector2(137, 503) -scale = Vector2(4.97917, 4.97917) +position = Vector2(142, 555) +scale = Vector2(10, 10) texture = ExtResource("7_wokip") hframes = 6 [node name="EasterEgg2" type="Sprite2D" parent="Decorations/Left Decor"] -position = Vector2(312, 528) -rotation = 1.33289 -scale = Vector2(4.09073, 4.29567) +position = Vector2(450, 572) +rotation = 0.633555 +scale = Vector2(10, 10) texture = ExtResource("7_wokip") hframes = 6 frame = 4 @@ -236,14 +141,22 @@ anchor_bottom = 1.0 grow_horizontal = 0 grow_vertical = 2 -[node name="Shadow2" type="Sprite2D" parent="Decorations/Right Decor"] -position = Vector2(351, 403) -scale = Vector2(19.0938, 11.8125) -texture = ExtResource("2_8o6th") +[node name="Shadow" type="Sprite2D" parent="Decorations/Right Decor"] +position = Vector2(300, 681) +scale = Vector2(10, 10) +texture = ExtResource("5_wt601") + +[node name="EasterEgg" type="Sprite2D" parent="Decorations/Right Decor"] +position = Vector2(416, 537) +rotation = 0.289725 +scale = Vector2(10, 10) +texture = ExtResource("7_wokip") +hframes = 6 +frame = 2 [node name="GoodBunny" type="Sprite2D" parent="Decorations/Right Decor"] -position = Vector2(388, 471.5) -scale = Vector2(7.14286, 7.02941) +position = Vector2(235, 579) +scale = Vector2(10, 10) texture = ExtResource("8_5vrmg") hframes = 5 vframes = 4 @@ -253,45 +166,58 @@ libraries = { "": SubResource("AnimationLibrary_5tgwk") } -[node name="EasterEgg" type="Sprite2D" parent="Decorations/Right Decor"] -position = Vector2(298.625, 516.969) -scale = Vector2(4.11458, 4.11458) -texture = ExtResource("7_wokip") -hframes = 6 -frame = 2 - -[node name="MainVBox" type="VBoxContainer" parent="."] +[node name="Panel" type="Panel" parent="Decorations"] +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -offset_left = 31.0 -offset_top = 22.0 -offset_right = -31.0 -offset_bottom = -22.0 grow_horizontal = 2 grow_vertical = 2 -theme = SubResource("Theme_w723v") +theme_override_styles/panel = SubResource("StyleBoxFlat_h5db4") -[node name="Label" type="Label" parent="MainVBox"] +[node name="VBoxContainer" type="VBoxContainer" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_constants/separation = 0 + +[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"] layout_mode = 2 -size_flags_horizontal = 4 -size_flags_vertical = 8 -theme = ExtResource("4_bmt8e") -theme_override_font_sizes/font_size = 50 -text = "HOPPY EASTER GAME THING" -horizontal_alignment = 1 -vertical_alignment = 1 +theme_override_constants/margin_left = 32 +theme_override_constants/margin_top = 32 +theme_override_constants/margin_right = 32 +theme_override_constants/margin_bottom = 32 -[node name="ButtonsVbox" type="VBoxContainer" parent="MainVBox"] +[node name="Label" type="Label" parent="VBoxContainer/MarginContainer"] +layout_mode = 2 +size_flags_horizontal = 5 +theme_override_colors/font_color = Color(0.388235, 0.294118, 0.490196, 1) +theme_override_colors/font_shadow_color = Color(0.227451, 0.172549, 0.290196, 1) +theme_override_font_sizes/font_size = 96 +text = "Happy Easter Game Thing" +horizontal_alignment = 1 +autowrap_mode = 2 + +[node name="MarginBox2" type="MarginContainer" parent="VBoxContainer"] +layout_mode = 2 +size_flags_vertical = 3 +theme_override_constants/margin_left = 32 +theme_override_constants/margin_top = 32 +theme_override_constants/margin_right = 32 +theme_override_constants/margin_bottom = 32 + +[node name="ButtonsVbox" type="VBoxContainer" parent="VBoxContainer/MarginBox2"] custom_minimum_size = Vector2(0, 495) layout_mode = 2 size_flags_horizontal = 4 -size_flags_vertical = 3 theme = ExtResource("4_bmt8e") -theme_override_constants/separation = 10 +theme_override_constants/separation = 8 alignment = 1 -[node name="PlayButton" type="Button" parent="MainVBox/ButtonsVbox"] +[node name="PlayButton" type="Button" parent="VBoxContainer/MarginBox2/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 focus_neighbor_left = NodePath("../QuitButton") @@ -304,7 +230,7 @@ theme = ExtResource("4_bmt8e") theme_override_font_sizes/font_size = 64 text = "Play" -[node name="SettingsButton" type="Button" parent="MainVBox/ButtonsVbox"] +[node name="SettingsButton" type="Button" parent="VBoxContainer/MarginBox2/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 focus_neighbor_left = NodePath("../PlayButton") @@ -317,7 +243,7 @@ theme = ExtResource("4_bmt8e") theme_override_font_sizes/font_size = 64 text = "Settings" -[node name="AboutButton" type="Button" parent="MainVBox/ButtonsVbox"] +[node name="AboutButton" type="Button" parent="VBoxContainer/MarginBox2/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 focus_neighbor_left = NodePath("../SettingsButton") @@ -330,7 +256,11 @@ theme = ExtResource("4_bmt8e") theme_override_font_sizes/font_size = 64 text = "About" -[node name="QuitButton" type="Button" parent="MainVBox/ButtonsVbox"] +[node name="Spacer" type="MarginContainer" parent="VBoxContainer/MarginBox2/ButtonsVbox"] +layout_mode = 2 +size_flags_vertical = 3 + +[node name="QuitButton" type="Button" parent="VBoxContainer/MarginBox2/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 focus_neighbor_left = NodePath("../AboutButton") @@ -348,7 +278,7 @@ stream = ExtResource("12_i62fw") autoplay = true bus = &"Music" -[connection signal="pressed" from="MainVBox/ButtonsVbox/PlayButton" to="." method="_on_play_button_pressed"] -[connection signal="pressed" from="MainVBox/ButtonsVbox/SettingsButton" to="." method="_on_settings_button_pressed"] -[connection signal="pressed" from="MainVBox/ButtonsVbox/AboutButton" to="." method="_on_about_button_pressed"] -[connection signal="pressed" from="MainVBox/ButtonsVbox/QuitButton" to="." method="_on_quit_button_pressed"] +[connection signal="pressed" from="VBoxContainer/MarginBox2/ButtonsVbox/PlayButton" to="." method="_on_play_button_pressed"] +[connection signal="pressed" from="VBoxContainer/MarginBox2/ButtonsVbox/SettingsButton" to="." method="_on_settings_button_pressed"] +[connection signal="pressed" from="VBoxContainer/MarginBox2/ButtonsVbox/AboutButton" to="." method="_on_about_button_pressed"] +[connection signal="pressed" from="VBoxContainer/MarginBox2/ButtonsVbox/QuitButton" to="." method="_on_quit_button_pressed"] diff --git a/Scripts/SaveSystem/GlobalSettings.gd b/Scripts/SaveSystem/GlobalSettings.gd index 85f3810..6162cc6 100644 --- a/Scripts/SaveSystem/GlobalSettings.gd +++ b/Scripts/SaveSystem/GlobalSettings.gd @@ -13,6 +13,7 @@ extends Node ] const resolutions_dictionary : Dictionary = { + "640x480" : Vector2(640, 480), "800x600" : Vector2(800, 600), "1024x546" : Vector2(1024, 546), "1280x720" : Vector2(1280, 720), diff --git a/Scripts/UI/MainMenuManager.gd b/Scripts/UI/MainMenuManager.gd index 93f573d..5d0e940 100644 --- a/Scripts/UI/MainMenuManager.gd +++ b/Scripts/UI/MainMenuManager.gd @@ -11,6 +11,7 @@ func _ready(): GlobalSettings.set_display_mode(Save.game_data.display_mode) GlobalSettings.toggle_vsync(Save.game_data.vsync_on) GlobalSettings.set_resolution(Save.game_data.current_resolution_index) + DisplayServer.window_set_min_size(Vector2(640,480)) GlobalSettings.update_master_volume(Save.game_data.master_volume) GlobalSettings.update_music_volume(Save.game_data.music_volume) GlobalSettings.update_sfx_volume(Save.game_data.sfx_volume) diff --git a/Scripts/UI/SettingsMenu.gd b/Scripts/UI/SettingsMenu.gd index 47a1db2..76937d0 100644 --- a/Scripts/UI/SettingsMenu.gd +++ b/Scripts/UI/SettingsMenu.gd @@ -29,8 +29,9 @@ func _ready(): GlobalSettings.set_display_mode(Save.game_data.display_mode) vsync_toggle.set_pressed_no_signal(Save.game_data.vsync_on) GlobalSettings.toggle_vsync(Save.game_data.vsync_on) + if Save.game_data.display_mode == DisplayServer.WINDOW_MODE_FULLSCREEN or Save.game_data.display_mode == DisplayServer.WINDOW_MODE_EXCLUSIVE_FULLSCREEN: + GlobalSettings.set_resolution(Save.game_data.current_resolution_index) resolutions_options_button.select(Save.game_data.current_resolution_index) - GlobalSettings.set_resolution(Save.game_data.current_resolution_index) master_volume_slider.value = Save.game_data.master_volume GlobalSettings.update_master_volume(Save.game_data.master_volume) music_volume_slider.value = Save.game_data.music_volume diff --git a/project.godot b/project.godot index 12f6809..a9d14ef 100644 --- a/project.godot +++ b/project.godot @@ -26,9 +26,9 @@ Save="*res://Scripts/SaveSystem/GameDataSaver.gd" [display] -window/size/viewport_width=1280 -window/size/viewport_height=720 -window/stretch/mode="viewport" +window/size/viewport_width=640 +window/size/viewport_height=1000 +window/stretch/mode="canvas_items" window/stretch/aspect="expand" [dotnet] From 376cce2b921bb03db3bf027106686aab22bfc14e Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 11 Apr 2023 17:00:09 +0200 Subject: [PATCH 18/26] Minor UI Tweaks --- Scenes/Main Menu.tscn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Scenes/Main Menu.tscn b/Scenes/Main Menu.tscn index cdeaa31..d1df224 100644 --- a/Scenes/Main Menu.tscn +++ b/Scenes/Main Menu.tscn @@ -58,7 +58,7 @@ _data = { } [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_h5db4"] -bg_color = Color(0, 0, 0, 0.156863) +bg_color = Color(0, 0, 0, 0.313726) [node name="MainMenu" type="Control" node_paths=PackedStringArray("default_focus")] layout_mode = 3 @@ -194,8 +194,6 @@ theme_override_constants/margin_bottom = 32 [node name="Label" type="Label" parent="VBoxContainer/MarginContainer"] layout_mode = 2 size_flags_horizontal = 5 -theme_override_colors/font_color = Color(0.388235, 0.294118, 0.490196, 1) -theme_override_colors/font_shadow_color = Color(0.227451, 0.172549, 0.290196, 1) theme_override_font_sizes/font_size = 96 text = "Happy Easter Game Thing" horizontal_alignment = 1 From 006e1046a35cfac8c1cadc840a61832c0efed6d0 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 11 Apr 2023 20:49:15 +0200 Subject: [PATCH 19/26] Fix Assigned Bottom Controll node --- Prefabs/Settings Menu.tscn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Prefabs/Settings Menu.tscn b/Prefabs/Settings Menu.tscn index 53a3fc5..edd5fb7 100644 --- a/Prefabs/Settings Menu.tscn +++ b/Prefabs/Settings Menu.tscn @@ -13,7 +13,7 @@ back_button = NodePath("Panel/MarginContainer/VBoxContainer/MarginContainer/Back tab_container = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs") bottom_item_video = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/ResolutionsOptions") bottom_item_audio = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/SFXVolSlider") -bottom_item_controls = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/VBox/MarginContainer/GridContainer/AttackRemapButton") +bottom_item_controls = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/AttackRemapButton") bottom_item_controls_gamepad = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/AttackRemapButton") display_options_button = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/DisplayModeOptions") vsync_toggle = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/VsyncButton") From 11e59ce0709acccc50ea88225a2d0c0390fcc406 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 11 Apr 2023 20:52:35 +0200 Subject: [PATCH 20/26] Use Input Dotproduct based Animation Choosing for Player --- Assets/UI/Theme.tres | 4 ++-- Scripts/PlayerController.gd | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Assets/UI/Theme.tres b/Assets/UI/Theme.tres index 4144fdf..ebcdebb 100644 --- a/Assets/UI/Theme.tres +++ b/Assets/UI/Theme.tres @@ -41,7 +41,7 @@ [ext_resource type="StyleBox" uid="uid://0jfr1uwuog0s" path="res://Assets/UI/Slider/v/background.tres" id="39_dl1e4"] [ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="40_bmcvq"] -[sub_resource type="Image" id="Image_avfxn"] +[sub_resource type="Image" id="Image_fjlcl"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0), "format": "RGBA8", @@ -51,7 +51,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_g5bup"] -image = SubResource("Image_avfxn") +image = SubResource("Image_fjlcl") [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_sj7h5"] diff --git a/Scripts/PlayerController.gd b/Scripts/PlayerController.gd index 1f77e73..6dc4630 100644 --- a/Scripts/PlayerController.gd +++ b/Scripts/PlayerController.gd @@ -25,20 +25,20 @@ func update_player_movement(delta : float): # Update Objects Physics calculations self.move_and_slide() pass - + func update_player_animation(): - var move_vector = get_move_input_vector() - match move_vector: + match get_move_input_vector(): Vector2.ZERO: animation_player.play("Idle") - Vector2.LEFT: animation_player.play("MoveLeft") - Vector2.RIGHT: animation_player.play("MoveRight") - Vector2.UP: animation_player.play("MoveUp") - Vector2.DOWN: animation_player.play("MoveDown") - _: handle_diagonal_animations(move_vector) - pass - -func handle_diagonal_animations(dir : Vector2): - if (dir.y > 0 and dir.x < 0) or (dir.y < 0 and dir.x < 0): animation_player.play("MoveLeft") - elif (dir.y > 0 and dir.x > 0) or (dir.y < 0 and dir.x > 0): animation_player.play("MoveRight") - else: animation_player.play("Idle") + _: + var left_dot = Vector2.LEFT.dot(self.velocity) + var right_dot = Vector2.RIGHT.dot(self.velocity) + var up_dot = Vector2.UP.dot(self.velocity) + var down_dot = Vector2.DOWN.dot(self.velocity) + + var max_dot = maxf(left_dot, maxf(right_dot, maxf(up_dot, down_dot))) + match max_dot: + left_dot: animation_player.play("MoveLeft") + right_dot: animation_player.play("MoveRight") + up_dot: animation_player.play("MoveUp") + down_dot: animation_player.play("MoveDown") pass From c7a49018173f56c1587c7e2267389006afbe3b71 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 11 Apr 2023 21:03:25 +0200 Subject: [PATCH 21/26] Make Tab switching Compatible with Remapping (you can now set the tab change button as an binding) --- Prefabs/Settings Menu.tscn | 3 ++- Scripts/UI/Remaping/RemapController.gd | 8 ++++++-- Scripts/UI/SettingsMenu.gd | 4 +++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Prefabs/Settings Menu.tscn b/Prefabs/Settings Menu.tscn index edd5fb7..be26545 100644 --- a/Prefabs/Settings Menu.tscn +++ b/Prefabs/Settings Menu.tscn @@ -7,7 +7,7 @@ [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_02uod"] bg_color = Color(0.439216, 0.631373, 0.537255, 1) -[node name="SettingsMenu" type="Node" node_paths=PackedStringArray("back_button", "tab_container", "bottom_item_video", "bottom_item_audio", "bottom_item_controls", "bottom_item_controls_gamepad", "display_options_button", "vsync_toggle", "resolutions_options_button", "master_volume_slider", "music_volume_slider", "sfx_volume_slider")] +[node name="SettingsMenu" type="Node" node_paths=PackedStringArray("back_button", "tab_container", "bottom_item_video", "bottom_item_audio", "bottom_item_controls", "bottom_item_controls_gamepad", "remap_controller", "display_options_button", "vsync_toggle", "resolutions_options_button", "master_volume_slider", "music_volume_slider", "sfx_volume_slider")] script = ExtResource("1_2rgd2") back_button = NodePath("Panel/MarginContainer/VBoxContainer/MarginContainer/Back Button") tab_container = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs") @@ -15,6 +15,7 @@ bottom_item_video = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/V bottom_item_audio = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/SFXVolSlider") bottom_item_controls = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/AttackRemapButton") bottom_item_controls_gamepad = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/AttackRemapButton") +remap_controller = NodePath("Remap Controller") display_options_button = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/DisplayModeOptions") vsync_toggle = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/VsyncButton") resolutions_options_button = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/ResolutionsOptions") diff --git a/Scripts/UI/Remaping/RemapController.gd b/Scripts/UI/Remaping/RemapController.gd index b091f86..8fd790c 100644 --- a/Scripts/UI/Remaping/RemapController.gd +++ b/Scripts/UI/Remaping/RemapController.gd @@ -1,4 +1,5 @@ extends Control +class_name RemapController @export var min_time_between_remaps := 0.4 @@ -6,6 +7,7 @@ var remap_button : Button var remap_action : String var time_since_remap := 0.0 +var is_remapping := false func _unhandled_key_input(event): if remap_button != null and event.pressed: @@ -17,7 +19,6 @@ func _input(event): if event is InputEventMouseButton and event.pressed: remap_key(event) if event is InputEventJoypadButton and event.pressed: - print(event) remap_key(event) if event is InputEventJoypadMotion: remap_key(event) @@ -31,10 +32,13 @@ func _ready(): func _process(delta): if remap_button == null: time_since_remap += delta + if is_remapping and time_since_remap > min_time_between_remaps: + is_remapping = false pass func start_remap(button : Button, action : String): - if(time_since_remap < min_time_between_remaps): return + if(is_remapping): return + is_remapping = true if(remap_button != null): remap_button.display_key() remap_button = button diff --git a/Scripts/UI/SettingsMenu.gd b/Scripts/UI/SettingsMenu.gd index 76937d0..cb8e4bb 100644 --- a/Scripts/UI/SettingsMenu.gd +++ b/Scripts/UI/SettingsMenu.gd @@ -1,6 +1,5 @@ extends Node -# Video Settings UI References @export var back_button : Control @export var tab_container : TabContainer @export var bottom_item_video : Control @@ -8,6 +7,8 @@ extends Node @export var bottom_item_controls : Control @export var bottom_item_controls_gamepad : Control +@export var remap_controller : RemapController + @export var display_options_button : OptionButton @export var vsync_toggle : CheckButton @export var resolutions_options_button : OptionButton @@ -45,6 +46,7 @@ func _process(_delta): pass func update_change_tab(): + if(remap_controller.is_remapping): return var do_left = Input.is_action_just_pressed("ui_tab_left") var do_right = Input.is_action_just_pressed("ui_tab_right") From 189e20d2e4bce8fdcde81aaf8b33dfe4a84f0622 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 11 Apr 2023 21:05:44 +0200 Subject: [PATCH 22/26] Fix Map Generating so that player is stuck in wall --- Scripts/MapGenerator.gd | 1 + 1 file changed, 1 insertion(+) diff --git a/Scripts/MapGenerator.gd b/Scripts/MapGenerator.gd index 7ed7e58..e9239af 100644 --- a/Scripts/MapGenerator.gd +++ b/Scripts/MapGenerator.gd @@ -30,6 +30,7 @@ func generate() -> Dictionary: for i in cave_gen_iterations: change_cells_by_neighbor_thresholds() set_borders_solid() + prepare_player_start_area() tile_array_to_terrain() From 6fa3602b65f96b104e43086289baf937a79c5b34 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 11 Apr 2023 21:51:55 +0200 Subject: [PATCH 23/26] Improve and Partially rebuild UI --- Prefabs/Settings Menu.tscn | 405 +++++++++++++++++++------------------ Scenes/Main Menu.tscn | 6 +- Scripts/UI/SettingsMenu.gd | 2 - 3 files changed, 211 insertions(+), 202 deletions(-) diff --git a/Prefabs/Settings Menu.tscn b/Prefabs/Settings Menu.tscn index be26545..f6aee97 100644 --- a/Prefabs/Settings Menu.tscn +++ b/Prefabs/Settings Menu.tscn @@ -7,21 +7,20 @@ [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_02uod"] bg_color = Color(0.439216, 0.631373, 0.537255, 1) -[node name="SettingsMenu" type="Node" node_paths=PackedStringArray("back_button", "tab_container", "bottom_item_video", "bottom_item_audio", "bottom_item_controls", "bottom_item_controls_gamepad", "remap_controller", "display_options_button", "vsync_toggle", "resolutions_options_button", "master_volume_slider", "music_volume_slider", "sfx_volume_slider")] +[node name="SettingsMenu" type="Node" node_paths=PackedStringArray("back_button", "tab_container", "bottom_item_video", "bottom_item_audio", "bottom_item_controls", "remap_controller", "display_options_button", "vsync_toggle", "resolutions_options_button", "master_volume_slider", "music_volume_slider", "sfx_volume_slider")] script = ExtResource("1_2rgd2") back_button = NodePath("Panel/MarginContainer/VBoxContainer/MarginContainer/Back Button") tab_container = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs") -bottom_item_video = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/ResolutionsOptions") -bottom_item_audio = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/SFXVolSlider") -bottom_item_controls = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/AttackRemapButton") -bottom_item_controls_gamepad = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/AttackRemapButton") +bottom_item_video = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Item/ResolutionsOptions") +bottom_item_audio = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Item/SFXVolSlider") +bottom_item_controls = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/AttackRemapButton") remap_controller = NodePath("Remap Controller") -display_options_button = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/DisplayModeOptions") -vsync_toggle = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/VsyncButton") -resolutions_options_button = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/ResolutionsOptions") -master_volume_slider = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MasterVolumeSlider") -music_volume_slider = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MusicVolSlider") -sfx_volume_slider = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/SFXVolSlider") +display_options_button = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Item/DisplayModeOptions") +vsync_toggle = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Item/VsyncButton") +resolutions_options_button = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Item/ResolutionsOptions") +master_volume_slider = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Item/MasterVolumeSlider") +music_volume_slider = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Item/MusicVolSlider") +sfx_volume_slider = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Item/SFXVolSlider") [node name="Remap Controller" type="Control" parent="."] visible = false @@ -62,6 +61,7 @@ size_flags_vertical = 3 tabs_rearrange_group = 0 [node name="Video" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs"] +visible = false layout_mode = 2 theme_override_constants/margin_left = 4 theme_override_constants/margin_top = 4 @@ -71,33 +71,57 @@ theme_override_constants/margin_bottom = 4 [node name="ScrollView" type="ScrollContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video"] layout_mode = 2 -[node name="VBox" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView"] -layout_mode = 2 -size_flags_horizontal = 3 -focus_neighbor_left = NodePath("../../../Audio/ScrollView/VBox") - -[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox"] +[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView"] clip_contents = true custom_minimum_size = Vector2(0, 425) layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 theme_override_constants/margin_left = 25 theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="GridContainer" type="GridContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer"] +[node name="HBoxContainer" type="HBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer"] layout_mode = 2 -columns = 3 -[node name="DisplayModeLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] +[node name="Label" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer"] +layout_mode = 2 +theme_override_constants/separation = 14 + +[node name="TopMargin" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Label"] +layout_mode = 2 +size_flags_horizontal = 3 +theme_override_constants/margin_top = 8 + +[node name="DisplayMode" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Label/TopMargin"] +custom_minimum_size = Vector2(0, 48) layout_mode = 2 text = "Display Mode" -[node name="Spacer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] +[node name="VSync" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Label"] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +text = "VSync +" + +[node name="Resolutions" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Label"] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +text = "Resolutions +" + +[node name="Spacer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer"] layout_mode = 2 size_flags_horizontal = 3 -[node name="DisplayModeOptions" type="OptionButton" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] +[node name="Item" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 3 +theme_override_constants/separation = 8 + +[node name="DisplayModeOptions" type="OptionButton" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Item"] +custom_minimum_size = Vector2(0, 48) layout_mode = 2 text_overrun_behavior = 1 clip_text = true @@ -114,29 +138,13 @@ popup/item_3/id = 3 popup/item_4/text = "Exclusive Full-Screen" popup/item_4/id = 4 -[node name="VSync Label" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] -layout_mode = 2 -text = "VSync -" - -[node name="Spacer2" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="VsyncButton" type="CheckButton" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] +[node name="VsyncButton" type="CheckButton" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Item"] +custom_minimum_size = Vector2(0, 48) layout_mode = 2 text = "Vsync" -[node name="ResolutionsLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] -layout_mode = 2 -text = "Resolutions -" - -[node name="Spacer3" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="ResolutionsOptions" type="OptionButton" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer"] +[node name="ResolutionsOptions" type="OptionButton" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Item"] +custom_minimum_size = Vector2(0, 48) layout_mode = 2 focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") fit_to_longest_item = false @@ -152,135 +160,200 @@ theme_override_constants/margin_bottom = 4 [node name="ScrollView" type="ScrollContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio"] layout_mode = 2 -[node name="VBox" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView"] +[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView"] +clip_contents = true +custom_minimum_size = Vector2(0, 425) layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 - -[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox"] -layout_mode = 2 theme_override_constants/margin_left = 25 theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="GridContainer" type="GridContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer"] +[node name="HBoxContainer" type="HBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer"] layout_mode = 2 -columns = 2 -[node name="MasterVolLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] +[node name="Label" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer"] +layout_mode = 2 +theme_override_constants/separation = 14 + +[node name="TopMargin" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Label"] +layout_mode = 2 +size_flags_horizontal = 3 +theme_override_constants/margin_top = 8 + +[node name="MasterVol" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Label/TopMargin"] +custom_minimum_size = Vector2(0, 48) layout_mode = 2 text = "Master Volume " -[node name="MasterVolumeSlider" type="HSlider" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] -layout_mode = 2 -size_flags_horizontal = 3 -min_value = -72.0 -max_value = 0.0 - -[node name="MusicVolLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] +[node name="MusicVol" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Label"] +custom_minimum_size = Vector2(0, 48) layout_mode = 2 text = "Music Volume " -[node name="MusicVolSlider" type="HSlider" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] +[node name="SFXVol" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Label"] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +text = "SFX Volume" + +[node name="Spacer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer"] +custom_minimum_size = Vector2(64, 0) +layout_mode = 2 + +[node name="Item" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 3 +theme_override_constants/separation = 8 + +[node name="MasterVolumeSlider" type="HSlider" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Item"] +custom_minimum_size = Vector2(0, 48) layout_mode = 2 size_flags_horizontal = 3 min_value = -72.0 max_value = 0.0 -[node name="SFXVolLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] +[node name="MusicVolSlider" type="HSlider" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Item"] +custom_minimum_size = Vector2(0, 48) layout_mode = 2 -text = "SFX Volume" +size_flags_horizontal = 3 +min_value = -72.0 +max_value = 0.0 -[node name="SFXVolSlider" type="HSlider" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer"] +[node name="SFXVolSlider" type="HSlider" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Item"] +custom_minimum_size = Vector2(0, 48) layout_mode = 2 size_flags_horizontal = 3 focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") min_value = -72.0 max_value = 0.0 -[node name="Controlls" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs"] -visible = false +[node name="Controls" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs"] layout_mode = 2 theme_override_constants/margin_left = 4 theme_override_constants/margin_top = 4 theme_override_constants/margin_right = 4 theme_override_constants/margin_bottom = 4 -[node name="ScrollView" type="ScrollContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls"] +[node name="ScrollView" type="ScrollContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls"] layout_mode = 2 -[node name="VBox" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView"] +[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 - -[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox"] -layout_mode = 2 theme_override_constants/margin_left = 25 theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="GridContainer" type="GridContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer"] +[node name="HBoxContainer" type="HBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer"] layout_mode = 2 -columns = 3 -[node name="MoveUpLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] +[node name="Label" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer"] +layout_mode = 2 +theme_override_constants/separation = 14 + +[node name="TopMargin" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] +layout_mode = 2 +size_flags_horizontal = 3 +theme_override_constants/margin_top = 8 + +[node name="MoveUp" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label/TopMargin"] +custom_minimum_size = Vector2(0, 48) layout_mode = 2 text = "Move Up" -[node name="Spacer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] +[node name="MoveLeft" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +text = "Move Left" + +[node name="MoveDown" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +text = "Move Down" + +[node name="MoveRight" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +text = "Move Right" + +[node name="Attack" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +text = "Attack +" + +[node name="Spacer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] +custom_minimum_size = Vector2(0, 32) layout_mode = 2 size_flags_horizontal = 3 -[node name="MoveUpRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="MoveUpController" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] +custom_minimum_size = Vector2(0, 48) +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="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="AttackController" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +text = "Attack Controller +" + +[node name="Spacer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="Item" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 3 +theme_override_constants/separation = 8 + +[node name="MoveUpRemapButton" 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 = "move_up" remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveLeftLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] -layout_mode = 2 -text = "Move Left" - -[node name="Spacer2" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="MoveLeftRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="MoveLeftRemapButton" 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" remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveDownLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] -layout_mode = 2 -text = "Move Down" - -[node name="Spacer3" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="MoveDownRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="MoveDownRemapButton" 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_down" remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveRightLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] -layout_mode = 2 -text = "Move RIght" - -[node name="Spacer4" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="MoveRightRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="MoveRightRemapButton" 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") @@ -288,16 +361,8 @@ script = ExtResource("2_4asaa") input_action_name = "move_right" remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="AttackLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] -layout_mode = 2 -text = "Attack -" - -[node name="Spacer5" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer"] -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="AttackRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="AttackRemapButton" 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") @@ -305,86 +370,36 @@ script = ExtResource("2_4asaa") input_action_name = "attack" remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="Gamepad" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs"] -visible = false -layout_mode = 2 -theme_override_constants/margin_left = 4 -theme_override_constants/margin_top = 4 -theme_override_constants/margin_right = 4 -theme_override_constants/margin_bottom = 4 - -[node name="ScrollView" type="ScrollContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad"] -layout_mode = 2 - -[node name="Vbox" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView"] -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_vertical = 3 - -[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox"] -layout_mode = 2 -theme_override_constants/margin_left = 25 -theme_override_constants/margin_top = 25 -theme_override_constants/margin_right = 25 -theme_override_constants/margin_bottom = 25 - -[node name="GridContainer" type="GridContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer"] -layout_mode = 2 -columns = 3 - -[node name="MoveUpLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] -layout_mode = 2 -text = "Move Up" - -[node name="Spacer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] +[node name="Spacers" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item"] +custom_minimum_size = Vector2(0, 32) layout_mode = 2 size_flags_horizontal = 3 -[node name="MoveUpRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] +[node name="MoveUpControllerRemapButton" 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 = "move_up_controller" remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveLeftLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] -layout_mode = 2 -text = "Move Left" - -[node name="Spacer2" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="MoveLeftRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer" node_paths=PackedStringArray("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="MoveDownLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] -layout_mode = 2 -text = "Move Down" - -[node name="Spacer3" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="MoveDownRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer" node_paths=PackedStringArray("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 size_flags_horizontal = 3 script = ExtResource("2_4asaa") input_action_name = "move_down_controller" remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveRightLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] -layout_mode = 2 -text = "Move RIght" - -[node name="Spacer4" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="MoveRightRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer" node_paths=PackedStringArray("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 size_flags_horizontal = 3 focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") @@ -392,21 +407,13 @@ script = ExtResource("2_4asaa") input_action_name = "move_right_controller" remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="AttackLabel" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] -layout_mode = 2 -text = "Attack -" - -[node name="Spacer5" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer"] -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="AttackRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer" node_paths=PackedStringArray("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 size_flags_horizontal = 3 focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") script = ExtResource("2_4asaa") -input_action_name = "attack" +input_action_name = "attack_controller" remap_controller = NodePath("../../../../../../../../../../Remap Controller") [node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer"] @@ -418,23 +425,23 @@ layout_mode = 2 theme_override_font_sizes/font_size = 64 text = "Back" -[connection signal="item_selected" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/DisplayModeOptions" to="." method="_on_display_mode_options_item_selected"] -[connection signal="toggled" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/VsyncButton" to="." method="_on_vsync_button_toggled"] -[connection signal="item_selected" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/VBox/MarginContainer/GridContainer/ResolutionsOptions" to="." method="_on_resolutions_options_item_selected"] -[connection signal="drag_ended" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MasterVolumeSlider" to="." method="_on_master_volume_slider_drag_ended"] -[connection signal="value_changed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MasterVolumeSlider" to="." method="_on_master_volume_slider_value_changed"] -[connection signal="drag_ended" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MusicVolSlider" to="." method="_on_music_vol_slider_drag_ended"] -[connection signal="value_changed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/MusicVolSlider" to="." method="_on_music_vol_slider_value_changed"] -[connection signal="drag_ended" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/SFXVolSlider" to="." method="_on_sfx_vol_slider_drag_ended"] -[connection signal="value_changed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/VBox/MarginContainer/GridContainer/SFXVolSlider" to="." method="_on_sfx_vol_slider_value_changed"] -[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveUpRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveUpRemapButton" method="_on_pressed"] -[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveLeftRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveLeftRemapButton" method="_on_pressed"] -[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveDownRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveDownRemapButton" method="_on_pressed"] -[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveRightRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/MoveRightRemapButton" method="_on_pressed"] -[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/AttackRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controlls/ScrollView/VBox/MarginContainer/GridContainer/AttackRemapButton" method="_on_pressed"] -[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveUpRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveUpRemapButton" method="_on_pressed"] -[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveLeftRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveLeftRemapButton" method="_on_pressed"] -[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveDownRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveDownRemapButton" method="_on_pressed"] -[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveRightRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/MoveRightRemapButton" method="_on_pressed"] -[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/AttackRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Gamepad/ScrollView/Vbox/MarginContainer/GridContainer/AttackRemapButton" method="_on_pressed"] +[connection signal="item_selected" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Item/DisplayModeOptions" to="." method="_on_display_mode_options_item_selected"] +[connection signal="toggled" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Item/VsyncButton" to="." method="_on_vsync_button_toggled"] +[connection signal="item_selected" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Item/ResolutionsOptions" to="." method="_on_resolutions_options_item_selected"] +[connection signal="drag_ended" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Item/MasterVolumeSlider" to="." method="_on_master_volume_slider_drag_ended"] +[connection signal="value_changed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Item/MasterVolumeSlider" to="." method="_on_master_volume_slider_value_changed"] +[connection signal="drag_ended" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Item/MusicVolSlider" to="." method="_on_music_vol_slider_drag_ended"] +[connection signal="value_changed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Item/MusicVolSlider" to="." method="_on_music_vol_slider_value_changed"] +[connection signal="drag_ended" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Item/SFXVolSlider" to="." method="_on_sfx_vol_slider_drag_ended"] +[connection signal="value_changed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Item/SFXVolSlider" to="." method="_on_sfx_vol_slider_value_changed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveUpRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveUpRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveLeftRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveLeftRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveDownRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveDownRemapButton" method="_on_pressed"] +[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/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/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/Scenes/Main Menu.tscn b/Scenes/Main Menu.tscn index d1df224..7b9e466 100644 --- a/Scenes/Main Menu.tscn +++ b/Scenes/Main Menu.tscn @@ -215,6 +215,10 @@ theme = ExtResource("4_bmt8e") theme_override_constants/separation = 8 alignment = 1 +[node name="Spacer" type="MarginContainer" parent="VBoxContainer/MarginBox2/ButtonsVbox"] +layout_mode = 2 +size_flags_vertical = 3 + [node name="PlayButton" type="Button" parent="VBoxContainer/MarginBox2/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 @@ -254,7 +258,7 @@ theme = ExtResource("4_bmt8e") theme_override_font_sizes/font_size = 64 text = "About" -[node name="Spacer" type="MarginContainer" parent="VBoxContainer/MarginBox2/ButtonsVbox"] +[node name="Spacer2" type="MarginContainer" parent="VBoxContainer/MarginBox2/ButtonsVbox"] layout_mode = 2 size_flags_vertical = 3 diff --git a/Scripts/UI/SettingsMenu.gd b/Scripts/UI/SettingsMenu.gd index cb8e4bb..ec42b02 100644 --- a/Scripts/UI/SettingsMenu.gd +++ b/Scripts/UI/SettingsMenu.gd @@ -5,7 +5,6 @@ extends Node @export var bottom_item_video : Control @export var bottom_item_audio : Control @export var bottom_item_controls : Control -@export var bottom_item_controls_gamepad : Control @export var remap_controller : RemapController @@ -62,7 +61,6 @@ func update_change_tab(): 0: back_button.focus_neighbor_top = bottom_item_video.get_path() 1: back_button.focus_neighbor_top = bottom_item_audio.get_path() 2: back_button.focus_neighbor_top = bottom_item_controls.get_path() - 3: back_button.focus_neighbor_top = bottom_item_controls_gamepad.get_path() back_button.grab_focus() pass From d8ec01161eaeaaf9c24f6fbe342cb1c01fc8a836 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 11 Apr 2023 22:28:22 +0200 Subject: [PATCH 24/26] Fixed Controller Rebinding to support Axis --- Scripts/SaveSystem/GameDataSaver.gd | 5 +++++ Scripts/SaveSystem/GlobalSettings.gd | 13 ++++++++++--- Scripts/UI/Remaping/RemapButton.gd | 4 +++- Scripts/UI/Remaping/RemapController.gd | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Scripts/SaveSystem/GameDataSaver.gd b/Scripts/SaveSystem/GameDataSaver.gd index 94203dd..948c914 100644 --- a/Scripts/SaveSystem/GameDataSaver.gd +++ b/Scripts/SaveSystem/GameDataSaver.gd @@ -21,6 +21,11 @@ func load_data(): "move_down": KEY_S, "move_right": KEY_D, "attack": "m" + str(MOUSE_BUTTON_LEFT), + "move_up_controller": "j" + str(JOY_AXIS_LEFT_Y) + "/-1.00", + "move_left_controller": "j" + str(JOY_AXIS_LEFT_X) + "/-1.00", + "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), } save_data() else: diff --git a/Scripts/SaveSystem/GlobalSettings.gd b/Scripts/SaveSystem/GlobalSettings.gd index 6162cc6..63954f8 100644 --- a/Scripts/SaveSystem/GlobalSettings.gd +++ b/Scripts/SaveSystem/GlobalSettings.gd @@ -9,7 +9,12 @@ extends Node "move_down", "move_left", "move_right", - "attack" + "attack", + "move_up_controller", + "move_down_controller", + "move_left_controller", + "move_right_controller", + "attack_controller" ] const resolutions_dictionary : Dictionary = { @@ -87,9 +92,11 @@ func set_controls_from_save_file() -> void: control_event = InputEventJoypadButton.new() control_event.button_index = binding "j": - binding = int(binding.right(binding.length()-1)) + binding = binding.right(binding.length()-1) + binding = binding.split("/") control_event = InputEventJoypadMotion.new() - control_event.axis = binding + control_event.axis = int(binding[0]) + control_event.axis_value = float(binding[1]) _: control_event = InputEventKey.new() control_event.set_keycode(binding) diff --git a/Scripts/UI/Remaping/RemapButton.gd b/Scripts/UI/Remaping/RemapButton.gd index 2a47aae..139d4c6 100644 --- a/Scripts/UI/Remaping/RemapButton.gd +++ b/Scripts/UI/Remaping/RemapButton.gd @@ -9,8 +9,10 @@ func _ready(): func display_key (): self.text = "%s" % InputMap.action_get_events(input_action_name)[0].as_text() if self.text.begins_with("Joypad Motion on Axis"): + print(self.text) var split_text = self.text.split(" ") - self.text = split_text[3] + " " + split_text[4] + self.text = "+" if float(split_text[13]) > 0 else "-" + self.text += split_text[3] + " " + split_text[4] + " " if self.text.begins_with("Joypad Button"): var split_text = self.text.split(" ") self.text = split_text[1] + " " + split_text[2] diff --git a/Scripts/UI/Remaping/RemapController.gd b/Scripts/UI/Remaping/RemapController.gd index 8fd790c..0c38369 100644 --- a/Scripts/UI/Remaping/RemapController.gd +++ b/Scripts/UI/Remaping/RemapController.gd @@ -59,7 +59,7 @@ func remap_key(event): "InputEventJoypadButton": Save.game_data["%s" % [remap_action]] = "b" + str(event.button_index) "InputEventJoypadMotion": - Save.game_data["%s" % [remap_action]] = "j" + str(event.axis) + Save.game_data["%s" % [remap_action]] = "j" + str(event.axis) + str("/1.00" if event.axis_value > 0 else "/-1.00") "InputEventMouseButton": Save.game_data["%s" % [remap_action]] = "m" + str(event.button_index) "InputEventKey": From 47ddb86bbbb2c808680150f2d4cf00c8e9f0a808 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 11 Apr 2023 22:39:39 +0200 Subject: [PATCH 25/26] Improve Remap Controller Axis Detection --- Scripts/UI/Remaping/RemapController.gd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Scripts/UI/Remaping/RemapController.gd b/Scripts/UI/Remaping/RemapController.gd index 0c38369..a5e6fa5 100644 --- a/Scripts/UI/Remaping/RemapController.gd +++ b/Scripts/UI/Remaping/RemapController.gd @@ -50,20 +50,20 @@ func start_remap(button : Button, action : String): pass func remap_key(event): - set_process_unhandled_key_input(false) - for key in InputMap.action_get_events(remap_action): - InputMap.action_erase_event(remap_action, key) - InputMap.action_add_event(remap_action, event) - match str(event.get_class()): "InputEventJoypadButton": Save.game_data["%s" % [remap_action]] = "b" + str(event.button_index) "InputEventJoypadMotion": + if abs(event.axis_value) < 0.5: return Save.game_data["%s" % [remap_action]] = "j" + str(event.axis) + str("/1.00" if event.axis_value > 0 else "/-1.00") "InputEventMouseButton": Save.game_data["%s" % [remap_action]] = "m" + str(event.button_index) "InputEventKey": Save.game_data["%s" % [remap_action]] = event.keycode + set_process_unhandled_key_input(false) + for key in InputMap.action_get_events(remap_action): + InputMap.action_erase_event(remap_action, key) + InputMap.action_add_event(remap_action, event) remap_button.display_key() remap_button.grab_focus() remap_button.disabled = false From 1f24357f1f37ccf488fb0c6d166b0108a13aeb71 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 11 Apr 2023 22:39:58 +0200 Subject: [PATCH 26/26] 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 = {