Merge pull request 'Ui Rebuild and Full Controller Support' (#59) from dev-base into stable

Reviewed-on: #59

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"
+source_file="res://Assets/Music/awesomeness.wav"
-dest_files=["res://.godot/imported/awesomeness.wav-59f1c1423f54ec46cf96ddbcf1a5f126.sample"]
+dest_files=["res://.godot/imported/awesomeness.wav-a3e25c2b7cc98b82991938c6ea85b10b.sample"]
 
 [params]
 
@@ -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

Assets/Music/omw-to-beat-the-big-bad.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://c6nf5s6xy2uii"
+path="res://.godot/imported/omw-to-beat-the-big-bad.wav-c6b466e6681b770ddf1c916b506747ec.sample"
+
+[deps]
+
+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]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=2
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sprites/EasterEgg.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dhvvw4yckl8x7"
+uid="uid://dlr823rtwhtq2"
-path="res://.godot/imported/Cake.png-21a0a7c4150ddbef1696bf64cc05c445.ctex"
+path="res://.godot/imported/EasterEgg.png-4cfbf590804f46fcc7c2581e76378011.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Assets/Sprites/Start Menu Old/Cake.png"
+source_file="res://Assets/Sprites/EasterEgg.png"
-dest_files=["res://.godot/imported/Cake.png-21a0a7c4150ddbef1696bf64cc05c445.ctex"]
+dest_files=["res://.godot/imported/EasterEgg.png-4cfbf590804f46fcc7c2581e76378011.ctex"]
 
 [params]
 

Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://daat37cyg0go5"
-path="res://.godot/imported/Egg 3.png-36b656e477565ae980ad61970e3fa5ae.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png"
-dest_files=["res://.godot/imported/Egg 3.png-36b656e477565ae980ad61970e3fa5ae.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

Assets/Sprites/UI/Heart.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://6snf183fgfo5"
+uid="uid://7j7ufllfyi0c"
-path="res://.godot/imported/Cross.png-0ee19fa549405b3294c8343e3a8bf496.ctex"
+path="res://.godot/imported/Heart.png-f9bbc38428c117b5a1733171680ae999.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Assets/Sprites/Start Menu Old/Cross.png"
+source_file="res://Assets/Sprites/UI/Heart.png"
-dest_files=["res://.godot/imported/Cross.png-0ee19fa549405b3294c8343e3a8bf496.ctex"]
+dest_files=["res://.godot/imported/Heart.png-f9bbc38428c117b5a1733171680ae999.ctex"]
 
 [params]
 

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"
+source_file="res://Assets/Sprites/UI/Shadow.png"
-dest_files=["res://.godot/imported/Shadow.png-a5365acb462689cb9834499edb8acb8b.ctex"]
+dest_files=["res://.godot/imported/Shadow.png-f1189895bd40fd4a82339bf75c98a455.ctex"]
 
 [params]
 

Assets/Temp Music/omw-to-beat-the-big-bad.wav.import

@@ -1,24 +0,0 @@
-[remap]
-
-importer="wav"
-type="AudioStreamWAV"
-uid="uid://c6nf5s6xy2uii"
-path="res://.godot/imported/omw-to-beat-the-big-bad.wav-7f8a9a2e19afe1786d6b9f29ff762163.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"]
-
-[params]
-
-force/8_bit=false
-force/mono=false
-force/max_rate=false
-force/max_rate_hz=44100
-edit/trim=false
-edit/normalize=false
-edit/loop_mode=0
-edit/loop_begin=0
-edit/loop_end=-1
-compress/mode=0

Assets/UI/Button/arrow_down.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://c3yg6u8yncau3"
+uid="uid://bj8jxblqmsubn"
-path="res://.godot/imported/Egg 2.png-af579f6c406ae3454de989d8d70067ac.ctex"
+path="res://.godot/imported/arrow_down.png-99038aa4c51a77212f9224ab71131733.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png"
+source_file="res://Assets/UI/Button/arrow_down.png"
-dest_files=["res://.godot/imported/Egg 2.png-af579f6c406ae3454de989d8d70067ac.ctex"]
+dest_files=["res://.godot/imported/arrow_down.png-99038aa4c51a77212f9224ab71131733.ctex"]
 
 [params]
 

Assets/UI/Button/checked.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://cp84ssaqs3pmp"
+uid="uid://je3kjtfx1kr3"
-path="res://.godot/imported/Jesus.png-1b5efe2b1083942c332ddea70bb782c5.ctex"
+path="res://.godot/imported/checked.png-8d2a59870cf92d0ef0f9d4a2a816b264.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Assets/Sprites/Start Menu Old/Jesus.png"
+source_file="res://Assets/UI/Button/checked.png"
-dest_files=["res://.godot/imported/Jesus.png-1b5efe2b1083942c332ddea70bb782c5.ctex"]
+dest_files=["res://.godot/imported/checked.png-8d2a59870cf92d0ef0f9d4a2a816b264.ctex"]
 
 [params]
 

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

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 = 0.0
+thickness = 8
+vertical = true

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)

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)

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.560784, 0.270588, 0.458824, 1)
+corner_detail = 1

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

Assets/UI/Check Box/checked.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c18dqb1wy3its"
+path="res://.godot/imported/checked.png-83054b4e8a309e56fc14d2b4b7f09229.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/UI/Check Box/checked.png"
+dest_files=["res://.godot/imported/checked.png-83054b4e8a309e56fc14d2b4b7f09229.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

Assets/UI/Check Box/unchecked.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://jta11o1n4c3d"
+path="res://.godot/imported/unchecked.png-76d51bc7ba83c5667c55e9367a92177b.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/UI/Check Box/unchecked.png"
+dest_files=["res://.godot/imported/unchecked.png-76d51bc7ba83c5667c55e9367a92177b.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

Assets/UI/Edit/normal.tres

@@ -0,0 +1,13 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://cx486vo60qcpp"]
+
+[resource]
+content_margin_left = 8.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_width_bottom = 4
+border_color = Color(0.388235, 0.294118, 0.490196, 1)

Assets/UI/Edit/readonly.tres

@@ -0,0 +1,13 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://dvj15u41tqtnm"]
+
+[resource]
+content_margin_left = 8.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_width_bottom = 4
+border_color = Color(0.745098, 0.760784, 0.721569, 1)

Assets/UI/Progress/background.tres

@@ -0,0 +1,9 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://dhna0fajb2uei"]
+
+[resource]
+content_margin_left = 0.0
+content_margin_top = 8.0
+content_margin_right = 0.0
+content_margin_bottom = 8.0
+bg_color = Color(0.560784, 0.270588, 0.458824, 1)
+corner_detail = 6

Assets/UI/Progress/fill.tres

@@ -0,0 +1,9 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://b3i7tjv3ok85r"]
+
+[resource]
+content_margin_left = 0.0
+content_margin_top = 8.0
+content_margin_right = 0.0
+content_margin_bottom = 8.0
+bg_color = Color(0.768627, 0.364706, 0.623529, 1)
+corner_detail = 6

Assets/UI/Scrollbar/h/background.tres

@@ -0,0 +1,9 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://04efvhwskbr6"]
+
+[resource]
+content_margin_left = 0.0
+content_margin_top = 8.0
+content_margin_right = 0.0
+content_margin_bottom = 8.0
+bg_color = Color(0.227451, 0.172549, 0.290196, 1)
+corner_detail = 6

Assets/UI/Scrollbar/h/background_focus.tres

@@ -0,0 +1,9 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://b1huhquesnexy"]
+
+[resource]
+content_margin_left = 0.0
+content_margin_top = 8.0
+content_margin_right = 0.0
+content_margin_bottom = 8.0
+bg_color = Color(0.388235, 0.294118, 0.490196, 1)
+corner_detail = 6

Assets/UI/Scrollbar/h/grabber.tres

@@ -0,0 +1,9 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://cgdxtbanwi5gp"]
+
+[resource]
+content_margin_left = 0.0
+content_margin_top = 8.0
+content_margin_right = 0.0
+content_margin_bottom = 8.0
+bg_color = Color(0.941176, 0.964706, 0.909804, 1)
+corner_detail = 6

Assets/UI/Scrollbar/h/grabber_highlight.tres

@@ -0,0 +1,9 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://b5e35dfka2svr"]
+
+[resource]
+content_margin_left = 0.0
+content_margin_top = 8.0
+content_margin_right = 0.0
+content_margin_bottom = 8.0
+bg_color = Color(0.768627, 0.364706, 0.623529, 1)
+corner_detail = 6

Assets/UI/Scrollbar/h/grabber_pressed.tres

@@ -0,0 +1,9 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://b6gse1t3c8ibf"]
+
+[resource]
+content_margin_left = 0.0
+content_margin_top = 8.0
+content_margin_right = 0.0
+content_margin_bottom = 8.0
+bg_color = Color(0.560784, 0.270588, 0.458824, 1)
+corner_detail = 6

Assets/UI/Scrollbar/v/background.tres

@@ -0,0 +1,9 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://de0w7yppc7e0l"]
+
+[resource]
+content_margin_left = 8.0
+content_margin_top = 0.0
+content_margin_right = 8.0
+content_margin_bottom = 0.0
+bg_color = Color(0.227451, 0.172549, 0.290196, 1)
+corner_detail = 6

Assets/UI/Scrollbar/v/background_focus.tres

@@ -0,0 +1,9 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://15jbtuchd7r6"]
+
+[resource]
+content_margin_left = 8.0
+content_margin_top = 0.0
+content_margin_right = 8.0
+content_margin_bottom = 0.0
+bg_color = Color(0.388235, 0.294118, 0.490196, 1)
+corner_detail = 6

Assets/UI/Scrollbar/v/grabber.tres

@@ -0,0 +1,9 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://cm4uy16ypsdyi"]
+
+[resource]
+content_margin_left = 8.0
+content_margin_top = 0.0
+content_margin_right = 8.0
+content_margin_bottom = 0.0
+bg_color = Color(0.941176, 0.964706, 0.909804, 1)
+corner_detail = 6

Assets/UI/Scrollbar/v/grabber_highlight.tres

@@ -0,0 +1,9 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://cmiivkeqn03sa"]
+
+[resource]
+content_margin_left = 8.0
+content_margin_top = 0.0
+content_margin_right = 8.0
+content_margin_bottom = 0.0
+bg_color = Color(0.768627, 0.364706, 0.623529, 1)
+corner_detail = 6

Assets/UI/Scrollbar/v/grabber_pressed.tres

@@ -0,0 +1,9 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://j31rmst7m2q7"]
+
+[resource]
+content_margin_left = 8.0
+content_margin_top = 0.0
+content_margin_right = 8.0
+content_margin_bottom = 0.0
+bg_color = Color(0.560784, 0.270588, 0.458824, 1)
+corner_detail = 6

Assets/UI/Slider/h/background.tres

@@ -0,0 +1,7 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://b8mdovvxl7lfl"]
+
+[resource]
+content_margin_top = 8.0
+content_margin_bottom = 8.0
+bg_color = Color(0.388235, 0.294118, 0.490196, 1)
+corner_detail = 6

Assets/UI/Slider/h/fill.tres

@@ -0,0 +1,7 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://bwlxiw44285g1"]
+
+[resource]
+content_margin_top = 8.0
+content_margin_bottom = 8.0
+bg_color = Color(0.768627, 0.364706, 0.623529, 1)
+corner_detail = 6

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

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

Assets/UI/Slider/handle_highlight.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://o3ufhj36lo0r"
+path="res://.godot/imported/handle_highlight.png-3c0c5c5ea2c929a2f46fe541186c89b9.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/UI/Slider/handle_highlight.png"
+dest_files=["res://.godot/imported/handle_highlight.png-3c0c5c5ea2c929a2f46fe541186c89b9.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

Assets/UI/Slider/v/background.tres

@@ -0,0 +1,7 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://0jfr1uwuog0s"]
+
+[resource]
+content_margin_left = 8.0
+content_margin_right = 8.0
+bg_color = Color(0.388235, 0.294118, 0.490196, 1)
+corner_detail = 6

Assets/UI/Slider/v/fill.tres

@@ -0,0 +1,8 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://bumc1mixgglv8"]
+
+[resource]
+content_margin_left = 8.0
+content_margin_right = 8.0
+bg_color = Color(0.768627, 0.364706, 0.623529, 1)
+corner_detail = 6
+expand_margin_bottom = 1.0

Assets/UI/Tab/left.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://de5dv104noe06"
+path="res://.godot/imported/left.png-fe931151dd93739e850931fd004c5b49.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/UI/Tab/left.png"
+dest_files=["res://.godot/imported/left.png-fe931151dd93739e850931fd004c5b49.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

Assets/UI/Tab/left_highlight.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dkotcqflp3e32"
+uid="uid://ce87u4fp6tnik"
-path="res://.godot/imported/Egg 1.png-716e24a6c475341e607429b1bf533bfe.ctex"
+path="res://.godot/imported/left_highlight.png-1ac6c29bf41e4a73a126b8bc0e6e9ba3.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png"
+source_file="res://Assets/UI/Tab/left_highlight.png"
-dest_files=["res://.godot/imported/Egg 1.png-716e24a6c475341e607429b1bf533bfe.ctex"]
+dest_files=["res://.godot/imported/left_highlight.png-1ac6c29bf41e4a73a126b8bc0e6e9ba3.ctex"]
 
 [params]
 

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)

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

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

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

Assets/UI/Tab/tap_selected.tres

@@ -0,0 +1,15 @@
+[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_top = 4.0
+expand_margin_bottom = 4.0

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

Assets/UI/Theme.tres

@@ -0,0 +1,207 @@
+[gd_resource type="Theme" load_steps=47 format=3 uid="uid://babphdknr2kkd"]
+
+[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_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",
+"height": 16,
+"mipmaps": false,
+"width": 4
+}
+
+[sub_resource type="ImageTexture" id="ImageTexture_g5bup"]
+image = SubResource("Image_fjlcl")
+
+[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("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)
+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_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)
+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_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_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("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)
+Label/constants/line_spacing = 8
+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("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_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("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("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 = 48
+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("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")

Assets/UI_Theme.tres

@@ -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")

Prefabs/Settings Menu.tscn

@@ -1,77 +1,130 @@
-[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"]
 
-[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")]
+[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", "remap_controller", "display_options_button", "vsync_toggle", "resolutions_options_button", "master_volume_slider", "music_volume_slider", "sfx_volume_slider")]
 script = ExtResource("1_2rgd2")
-display_options_button = NodePath("CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/DisplayModeOptions")
+back_button = NodePath("Panel/MarginContainer/VBoxContainer/MarginContainer/Back Button")
-vsync_toggle = NodePath("CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/VsyncButton")
+tab_container = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs")
-resolutions_options_button = NodePath("CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/ResolutionsOptions")
+bottom_item_video = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Item/ResolutionsOptions")
-master_volume_slider = NodePath("CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MasterVolumeSlider")
+bottom_item_audio = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Item/SFXVolSlider")
-music_volume_slider = NodePath("CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MusicVolSlider")
+bottom_item_controls = NodePath("Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/AttackRemapButton")
-sfx_volume_slider = NodePath("CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/SFXVolSlider")
+remap_controller = NodePath("Remap Controller")
+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="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="."]
+[node name="MarginContainer" type="MarginContainer" parent="Panel"]
-anchors_preset = 10
+layout_mode = 1
-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
+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="SettingsTabs" type="TabContainer" parent="CenterContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="Panel/MarginContainer"]
-custom_minimum_size = Vector2(1050, 475)
 layout_mode = 2
-theme_override_font_sizes/font_size = 29
 
-[node name="Video" type="VBoxContainer" parent="CenterContainer/SettingsTabs"]
+[node name="SettingsTabs" type="TabContainer" parent="Panel/MarginContainer/VBoxContainer"]
 layout_mode = 2
-focus_neighbor_left = NodePath("../Controls")
+size_flags_vertical = 3
+tabs_rearrange_group = 0
 
-[node name="MarginContainer" type="MarginContainer" parent="CenterContainer/SettingsTabs/Video"]
+[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
+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="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="VideoSettings" type="GridContainer" parent="CenterContainer/SettingsTabs/Video/MarginContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer"]
 layout_mode = 2
-columns = 2
 
-[node name="DisplayModeLabel" type="Label" parent="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings"]
+[node name="Label" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer"]
-custom_minimum_size = Vector2(400, 40)
+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
-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"]
+[node name="VSync" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Label"]
-custom_minimum_size = Vector2(500, 40)
+custom_minimum_size = Vector2(0, 48)
 layout_mode = 2
-size_flags_horizontal = 10
+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="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
 item_count = 5
 selected = 0
 popup/item_0/text = "Full-Screen"
@@ -85,214 +138,367 @@ 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="VsyncButton" type="CheckButton" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Item"]
-custom_minimum_size = Vector2(400, 40)
+custom_minimum_size = Vector2(0, 48)
 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)
-layout_mode = 2
-size_flags_horizontal = 10
 text = "Vsync"
 
-[node name="ResolutionsLabel" type="Label" parent="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings"]
+[node name="ResolutionsOptions" type="OptionButton" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Video/ScrollView/MarginContainer/HBoxContainer/Item"]
-custom_minimum_size = Vector2(400, 40)
+custom_minimum_size = Vector2(0, 48)
 layout_mode = 2
-theme_override_colors/font_color = Color(0, 0, 0, 1)
+focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button")
-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)
-layout_mode = 2
-size_flags_horizontal = 10
 fit_to_longest_item = false
 
-[node name="Audio" type="VBoxContainer" parent="CenterContainer/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="CenterContainer/SettingsTabs/Audio"]
+[node name="ScrollView" type="ScrollContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio"]
+layout_mode = 2
+
+[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
 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="AudioSettings" type="GridContainer" parent="CenterContainer/SettingsTabs/Audio/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="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings"]
+[node name="Label" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer"]
-custom_minimum_size = Vector2(400, 40)
+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
-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"]
+[node name="MusicVol" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Label"]
-custom_minimum_size = Vector2(500, 40)
+custom_minimum_size = Vector2(0, 48)
 layout_mode = 2
-size_flags_horizontal = 10
-min_value = -72.0
-max_value = 0.0
-
-[node name="MusicVolLabel" type="Label" parent="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings"]
-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"]
+[node name="SFXVol" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Label"]
-custom_minimum_size = Vector2(500, 40)
+custom_minimum_size = Vector2(0, 48)
 layout_mode = 2
-size_flags_horizontal = 10
-min_value = -72.0
-max_value = 0.0
-
-[node name="SFXVolLabel" type="Label" parent="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings"]
-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="Spacer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer"]
-custom_minimum_size = Vector2(500, 40)
+custom_minimum_size = Vector2(64, 0)
 layout_mode = 2
-size_flags_horizontal = 10
+
+[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="Controls" type="VBoxContainer" parent="CenterContainer/SettingsTabs"]
+[node name="MusicVolSlider" type="HSlider" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Audio/ScrollView/MarginContainer/HBoxContainer/Item"]
-visible = false
+custom_minimum_size = Vector2(0, 48)
+layout_mode = 2
+size_flags_horizontal = 3
+min_value = -72.0
+max_value = 0.0
+
+[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="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/Controls"]
 layout_mode = 2
 
-[node name="Remap Controller" type="Control" parent="CenterContainer/SettingsTabs/Controls"]
+[node name="MarginContainer" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView"]
-layout_mode = 2
-script = ExtResource("2_2f8ap")
-
-[node name="MarginContainer" type="MarginContainer" parent="CenterContainer/SettingsTabs/Controls"]
-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="ControlSettings" type="GridContainer" parent="CenterContainer/SettingsTabs/Controls/MarginContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer"]
 layout_mode = 2
-columns = 2
 
-[node name="MoveUpLabel" type="Label" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings"]
+[node name="Label" type="VBoxContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer"]
-custom_minimum_size = Vector2(400, 40)
+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
-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")]
+[node name="MoveLeft" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"]
-custom_minimum_size = Vector2(500, 40)
+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="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="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
+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
-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="MoveLeftRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item" node_paths=PackedStringArray("remap_controller")]
-custom_minimum_size = Vector2(400, 40)
+custom_minimum_size = Vector2(0, 48)
 layout_mode = 2
-theme_override_colors/font_color = Color(0, 0, 0, 1)
+size_flags_horizontal = 3
-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)
-layout_mode = 2
-size_flags_horizontal = 10
-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="MoveDownRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item" node_paths=PackedStringArray("remap_controller")]
-custom_minimum_size = Vector2(400, 40)
+custom_minimum_size = Vector2(0, 48)
 layout_mode = 2
-theme_override_colors/font_color = Color(0, 0, 0, 1)
+size_flags_horizontal = 3
-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)
-layout_mode = 2
-size_flags_horizontal = 10
-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="MoveRightRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item" node_paths=PackedStringArray("remap_controller")]
-custom_minimum_size = Vector2(400, 40)
+custom_minimum_size = Vector2(0, 48)
 layout_mode = 2
-theme_override_colors/font_color = Color(0, 0, 0, 1)
+size_flags_horizontal = 3
-theme_override_font_sizes/font_size = 20
+focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button")
-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)
-layout_mode = 2
-size_flags_horizontal = 10
-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="."]
+[node name="AttackRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item" node_paths=PackedStringArray("remap_controller")]
-custom_minimum_size = Vector2(500, 40)
+custom_minimum_size = Vector2(0, 48)
-anchors_preset = 7
+layout_mode = 2
-anchor_left = 0.5
+size_flags_horizontal = 3
-anchor_top = 1.0
+focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button")
-anchor_right = 0.5
+script = ExtResource("2_4asaa")
-anchor_bottom = 1.0
+input_action_name = "attack"
-offset_left = -250.0
+remap_controller = NodePath("../../../../../../../../../../Remap Controller")
-offset_top = -80.0
+
-offset_right = 250.0
+[node name="Spacers" type="MarginContainer" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item"]
-offset_bottom = -40.0
+custom_minimum_size = Vector2(0, 32)
-grow_horizontal = 2
+layout_mode = 2
-grow_vertical = 0
+size_flags_horizontal = 3
-theme_override_font_sizes/font_size = 23
+
+[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="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="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
+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")
+
+[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
+size_flags_horizontal = 3
+focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button")
+script = ExtResource("2_4asaa")
+input_action_name = "attack_controller"
+remap_controller = NodePath("../../../../../../../../../../Remap Controller")
+
+[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="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/DisplayModeOptions" to="." method="_on_display_mode_options_item_selected"]
+[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="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/VsyncButton" to="." method="_on_vsync_button_toggled"]
+[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="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/ResolutionsOptions" to="." method="_on_resolutions_options_item_selected"]
+[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="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MasterVolumeSlider" to="." method="_on_master_volume_slider_drag_ended"]
+[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="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MasterVolumeSlider" to="." method="_on_master_volume_slider_value_changed"]
+[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="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MusicVolSlider" to="." method="_on_music_vol_slider_drag_ended"]
+[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="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MusicVolSlider" to="." method="_on_music_vol_slider_value_changed"]
+[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="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/SFXVolSlider" to="." method="_on_sfx_vol_slider_drag_ended"]
+[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="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/SFXVolSlider" to="." method="_on_sfx_vol_slider_value_changed"]
+[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="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveUpRemapButton" to="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveUpRemapButton" method="_on_pressed"]
+[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="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveLeftRemapButton" to="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveLeftRemapButton" 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="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveDownRemapButton" to="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveDownRemapButton" 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="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveRightRemapButton" to="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveRightRemapButton" 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="Back Button" to="." method="_on_back_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/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"]

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_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_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_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
+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_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_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"]

Scenes/Main Menu.tscn

@@ -1,35 +1,92 @@
-[gd_scene load_steps=14 format=3 uid="uid://4fysk8vaw3e1"]
+[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/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="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="Theme" uid="uid://babphdknr2kkd" path="res://Assets/UI/Theme.tres" id="4_bmt8e"]
-[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://tjxkew3m4v8m" path="res://Assets/Sprites/UI/Shadow.png" id="5_wt601"]
-[ext_resource type="Texture2D" uid="uid://cp84ssaqs3pmp" path="res://Assets/Sprites/UI Elements/Jesus.png" id="6_wnx18"]
+[ext_resource type="Texture2D" uid="uid://ojlfqxj5bilo" path="res://Assets/Sprites/Jesus/jesus_spritesheet.png" id="7_g28i1"]
-[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://dlr823rtwhtq2" path="res://Assets/Sprites/EasterEgg.png" id="7_wokip"]
-[ext_resource type="Theme" uid="uid://o3vg845para" path="res://Assets/UI_Theme.tres" id="8_lr748"]
+[ext_resource type="Texture2D" uid="uid://c54k7fn4fu42s" path="res://Assets/Sprites/Bunny/good_bunny_spritesheet.png" id="8_5vrmg"]
-[ext_resource type="Script" path="res://Scripts/UI/MenuButton.gd" id="9_2cu5l"]
+[ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/Music/omw-to-beat-the-big-bad.wav" id="12_i62fw"]
-[ext_resource type="Texture2D" uid="uid://6snf183fgfo5" path="res://Assets/Sprites/UI Elements/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")]
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5uvie"]
-script = ExtResource("1_qepq0")
+bg_color = Color(0.439216, 0.631373, 0.537255, 1)
-game_scene = ExtResource("2_28004")
-settings_scene = ExtResource("3_r3r61")
-default_focus = NodePath("MainVBox/ButtonsVbox/PlayButton")
 
-[node name="ColorRect" type="ColorRect" parent="."]
+[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.5
+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_h5db4"]
+bg_color = Color(0, 0, 0, 0.313726)
+
+[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
-color = Color(0.576471, 0.831373, 0.709804, 1)
+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("VBoxContainer/MarginBox2/ButtonsVbox/PlayButton")
+autostart_animations = Array[NodePath]([NodePath("Decorations/Left Decor/Jesus/AnimationPlayer"), NodePath("Decorations/Right Decor/GoodBunny/AnimationPlayer")])
+
+[node name="Panel" type="Panel" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+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
@@ -44,24 +101,35 @@ anchor_bottom = 1.0
 grow_vertical = 2
 
 [node name="Shadow" type="Sprite2D" parent="Decorations/Left Decor"]
-position = Vector2(226.563, 338.875)
+position = Vector2(272, 686)
-scale = Vector2(22.7773, 15.6953)
+scale = Vector2(10, 10)
-texture = ExtResource("2_8o6th")
+texture = ExtResource("5_wt601")
-
-[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)
+position = Vector2(279, 408)
-scale = Vector2(7.0431, 6.97321)
+scale = Vector2(10, 10)
-texture = ExtResource("6_wnx18")
+texture = ExtResource("7_g28i1")
+hframes = 8
+vframes = 4
 
-[node name="Cake" type="Sprite2D" parent="Decorations/Left Decor"]
+[node name="AnimationPlayer" type="AnimationPlayer" parent="Decorations/Left Decor/Jesus"]
-position = Vector2(310, 491)
+libraries = {
-scale = Vector2(2.59375, 2.32031)
+"": SubResource("AnimationLibrary_xufdy")
-texture = ExtResource("5_7ull8")
+}
+
+[node name="EasterEgg" type="Sprite2D" parent="Decorations/Left Decor"]
+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(450, 572)
+rotation = 0.633555
+scale = Vector2(10, 10)
+texture = ExtResource("7_wokip")
+hframes = 6
+frame = 4
 
 [node name="Right Decor" type="CenterContainer" parent="Decorations"]
 custom_minimum_size = Vector2(576, 0)
@@ -73,53 +141,85 @@ anchor_bottom = 1.0
 grow_horizontal = 0
 grow_vertical = 2
 
-[node name="Shadow2" type="Sprite2D" parent="Decorations/Right Decor"]
+[node name="Shadow" type="Sprite2D" parent="Decorations/Right Decor"]
-position = Vector2(351, 403)
+position = Vector2(300, 681)
-scale = Vector2(19.0938, 11.8125)
+scale = Vector2(10, 10)
-texture = ExtResource("2_8o6th")
+texture = ExtResource("5_wt601")
 
-[node name="Egg2" type="Sprite2D" parent="Decorations/Right Decor"]
+[node name="EasterEgg" type="Sprite2D" parent="Decorations/Right Decor"]
-position = Vector2(294, 487)
+position = Vector2(416, 537)
-rotation = -1.5708
+rotation = 0.289725
-scale = Vector2(4.89203, 5.21732)
+scale = Vector2(10, 10)
-texture = ExtResource("6_45o7d")
+texture = ExtResource("7_wokip")
-
+hframes = 6
-[node name="Egg1" type="Sprite2D" parent="Decorations/Right Decor"]
+frame = 2
-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(235, 579)
-scale = Vector2(7.14286, 7.02941)
+scale = Vector2(10, 10)
-hframes = 6
+texture = ExtResource("8_5vrmg")
+hframes = 5
+vframes = 4
 
-[node name="MainVBox" type="VBoxContainer" parent="."]
+[node name="AnimationPlayer" type="AnimationPlayer" parent="Decorations/Right Decor/GoodBunny"]
+libraries = {
+"": SubResource("AnimationLibrary_5tgwk")
+}
+
+[node name="Panel" type="Panel" parent="Decorations"]
+layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-theme = ExtResource("8_lr748")
+theme_override_styles/panel = SubResource("StyleBoxFlat_h5db4")
 
-[node name="CenterContainer" type="CenterContainer" parent="MainVBox"]
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
-custom_minimum_size = Vector2(0, 150)
+layout_mode = 1
-layout_mode = 2
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_constants/separation = 0
 
-[node name="Label" type="Label" parent="MainVBox/CenterContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"]
 layout_mode = 2
-theme_override_font_sizes/font_size = 50
+theme_override_constants/margin_left = 32
-text = "HOPPY EASTER GAME THING"
+theme_override_constants/margin_top = 32
+theme_override_constants/margin_right = 32
+theme_override_constants/margin_bottom = 32
+
+[node name="Label" type="Label" parent="VBoxContainer/MarginContainer"]
+layout_mode = 2
+size_flags_horizontal = 5
+theme_override_font_sizes/font_size = 96
+text = "Happy Easter Game Thing"
 horizontal_alignment = 1
-vertical_alignment = 1
+autowrap_mode = 2
 
-[node name="ButtonsVbox" type="VBoxContainer" parent="MainVBox"]
+[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
-theme_override_constants/separation = 10
+size_flags_horizontal = 4
+theme = ExtResource("4_bmt8e")
+theme_override_constants/separation = 8
 alignment = 1
 
-[node name="PlayButton" type="TextureButton" parent="MainVBox/ButtonsVbox" node_paths=PackedStringArray("leftPointer", "rightPointer", "textBox")]
+[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
 focus_neighbor_left = NodePath("../QuitButton")
@@ -128,39 +228,11 @@ focus_neighbor_right = NodePath("../SettingsButton")
 focus_neighbor_bottom = NodePath("../SettingsButton")
 focus_next = NodePath("../SettingsButton")
 focus_previous = NodePath("../QuitButton")
-mouse_default_cursor_shape = 2
+theme = ExtResource("4_bmt8e")
-script = ExtResource("9_2cu5l")
+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"]
+[node name="SettingsButton" type="Button" parent="VBoxContainer/MarginBox2/ButtonsVbox"]
-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")]
 custom_minimum_size = Vector2(0, 40)
 layout_mode = 2
 focus_neighbor_left = NodePath("../PlayButton")
@@ -169,39 +241,11 @@ focus_neighbor_right = NodePath("../AboutButton")
 focus_neighbor_bottom = NodePath("../AboutButton")
 focus_next = NodePath("../AboutButton")
 focus_previous = NodePath("../PlayButton")
-mouse_default_cursor_shape = 2
+theme = ExtResource("4_bmt8e")
-script = ExtResource("9_2cu5l")
+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"]
+[node name="AboutButton" type="Button" parent="VBoxContainer/MarginBox2/ButtonsVbox"]
-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")]
 custom_minimum_size = Vector2(0, 40)
 layout_mode = 2
 focus_neighbor_left = NodePath("../SettingsButton")
@@ -210,39 +254,15 @@ focus_neighbor_right = NodePath("../QuitButton")
 focus_neighbor_bottom = NodePath("../QuitButton")
 focus_next = NodePath("../QuitButton")
 focus_previous = NodePath("../SettingsButton")
-mouse_default_cursor_shape = 2
+theme = ExtResource("4_bmt8e")
-script = ExtResource("9_2cu5l")
+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"]
+[node name="Spacer2" type="MarginContainer" parent="VBoxContainer/MarginBox2/ButtonsVbox"]
-layout_mode = 1
+layout_mode = 2
-anchors_preset = 15
+size_flags_vertical = 3
-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"]
+[node name="QuitButton" type="Button" parent="VBoxContainer/MarginBox2/ButtonsVbox"]
-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")]
 custom_minimum_size = Vector2(0, 40)
 layout_mode = 2
 focus_neighbor_left = NodePath("../AboutButton")
@@ -251,44 +271,16 @@ focus_neighbor_right = NodePath("../PlayButton")
 focus_neighbor_bottom = NodePath("../PlayButton")
 focus_next = NodePath("../PlayButton")
 focus_previous = NodePath("../AboutButton")
-mouse_default_cursor_shape = 2
+theme = ExtResource("4_bmt8e")
-script = ExtResource("9_2cu5l")
+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"
 
-[connection signal="pressed" from="MainVBox/ButtonsVbox/PlayButton" to="." method="_on_play_button_pressed"]
+[connection signal="pressed" from="VBoxContainer/MarginBox2/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="VBoxContainer/MarginBox2/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="VBoxContainer/MarginBox2/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/QuitButton" to="." method="_on_quit_button_pressed"]

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"]

Scenes/Test.tscn

@@ -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")

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,9 +34,12 @@ 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()
+		else:
+			animation_player.stop()
 	pass
 
 func _on_collision(body):
@@ -64,8 +68,19 @@ func sub_on_death(callback : Callable):
 	on_death_callbacks.push_front(callback)
 	pass
 
+func update_animation():
+	match self.velocity:
+		Vector2.ZERO: 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

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()
 	

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")
+	return (input_direction if not input_direction_controller.length() > input_direction.length() else input_direction_controller.normalized())
 
 func update_player_movement(delta : float):
 	var input = get_move_input_vector()
@@ -26,18 +27,18 @@ func update_player_movement(delta : float):
 	pass
 	
 func update_player_animation():
-	var move_vector = get_move_input_vector()
+	match get_move_input_vector():
-	match move_vector:
 		Vector2.ZERO: animation_player.play("Idle")
-		Vector2.LEFT: animation_player.play("MoveLeft") 
+		_: 
-		Vector2.RIGHT: animation_player.play("MoveRight") 
+			var left_dot = Vector2.LEFT.dot(self.velocity)
-		Vector2.UP: animation_player.play("MoveUp") 
+			var right_dot = Vector2.RIGHT.dot(self.velocity)
-		Vector2.DOWN: animation_player.play("MoveDown") 
+			var up_dot = Vector2.UP.dot(self.velocity)
-		_: handle_diagonal_animations(move_vector)
+			var down_dot = Vector2.DOWN.dot(self.velocity)
-	pass
 			
-func handle_diagonal_animations(dir : Vector2):
+			var max_dot = maxf(left_dot, maxf(right_dot, maxf(up_dot, down_dot)))
-	if (dir.y > 0 and dir.x < 0) or (dir.y < 0 and dir.x < 0): animation_player.play("MoveLeft")
+			match max_dot:
-	elif (dir.y > 0 and dir.x > 0) or (dir.y < 0 and dir.x > 0): animation_player.play("MoveRight")
+				left_dot: animation_player.play("MoveLeft") 
-	else: animation_player.play("Idle")
+				right_dot: animation_player.play("MoveRight") 
+				up_dot: animation_player.play("MoveUp") 
+				down_dot: animation_player.play("MoveDown") 
 	pass

Scripts/SaveSystem/GameDataSaver.gd

@@ -16,6 +16,20 @@ func load_data():
 			"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),
+			"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),
+			"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:

Scripts/SaveSystem/GlobalSettings.gd

@@ -4,10 +4,28 @@ 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",
+	"attack",
+	"move_up_controller",
+	"move_down_controller",
+	"move_left_controller",
+	"move_right_controller",
+	"attack_controller",
+	"aim_up_controller",
+	"aim_left_controller",
+	"aim_down_controller",
+	"aim_right_controller"
+]
+
 const resolutions_dictionary : Dictionary = {
+	"640x480" : Vector2(640, 480),
 	"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),
@@ -59,3 +77,32 @@ 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:
+		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 = binding.right(binding.length()-1)
+				binding = binding.split("/")
+				control_event = InputEventJoypadMotion.new()
+				control_event.axis = int(binding[0])
+				control_event.axis_value = float(binding[1])
+			_:
+				control_event = InputEventKey.new()
+				control_event.set_keycode(binding)
+		InputMap.action_add_event(remappable_input_action, control_event)
+	pass

Scripts/UI/MainMenuManager.gd

@@ -2,17 +2,22 @@ extends Node
 
 @export var game_scene : Resource
 @export var settings_scene : Resource
-@export var default_focus : TextureButton
+@export var default_focus : Control
+@export var autostart_animations : Array[NodePath]
 
 # 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)
+	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)
 	default_focus.grab_focus()
+	for animation in autostart_animations:
+		(get_node(animation) as AnimationPlayer).play("Autostart")
 	pass 
 
 func _on_play_button_pressed():
@@ -22,6 +27,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
 

Scripts/UI/MenuButton.gd

@@ -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

Scripts/UI/Remaping/RemapButton.gd

@@ -7,7 +7,15 @@ 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"):
+		print(self.text)
+		var split_text = self.text.split(" ")
+		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]
 	pass
 
 func _on_pressed():

Scripts/UI/Remaping/RemapController.gd

@@ -1,34 +1,72 @@
 extends Control
+class_name RemapController
+
+@export var min_time_between_remaps := 0.4
 
 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:
 		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:
+			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
+		if is_remapping and time_since_remap > min_time_between_remaps:
+			is_remapping = false
+	pass
+	
 func start_remap(button : Button, action : String):
+	if(is_remapping): return
+	is_remapping = true
 	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
 
 func remap_key(event):
-	print(event)
+	match str(event.get_class()):
-	# Do Actual Rebinding
+		"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
+	time_since_remap = 0
 	remap_button = null
-	set_process_unhandled_key_input(false)
 	pass

Scripts/UI/SettingsMenu.gd

@@ -1,10 +1,19 @@
 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 remap_controller : RemapController
+
 @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,13 +21,17 @@ 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)
 	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
@@ -27,12 +40,38 @@ func _ready():
 	GlobalSettings.update_sfx_volume(Save.game_data.sfx_volume)
 	pass
 	
+func _process(_delta):
+	update_change_tab()
+	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")
+	
+	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():
 		resolutions_options_button.add_item(key)
 
 # Other Buttons
 func _on_back_pressed():
+	Save.save_data()
+	on_back.call()
 	queue_free()
 	pass
 

Scripts/WeaponSystem/WeaponController.gd

@@ -6,13 +6,16 @@ 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
 	
+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):
 	var projectile = projectilePrefab.instantiate()

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]
 
@@ -26,9 +26,9 @@ Save="*res://Scripts/SaveSystem/GameDataSaver.gd"
 
 [display]
 
-window/size/viewport_width=1280
+window/size/viewport_width=640
-window/size/viewport_height=720
+window/size/viewport_height=1000
-window/stretch/mode="viewport"
+window/stretch/mode="canvas_items"
 window/stretch/aspect="expand"
 
 [dotnet]
@@ -37,15 +37,35 @@ project/assembly_name="HoppyEaster"
 
 [gui]
 
-theme/custom="res://Assets/UI_Theme.tres"
+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)
+]
+}
+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={
 "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)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":-1.0,"script":null)
 ]
 }
 ui_right={
@@ -53,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={
@@ -60,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={
@@ -67,40 +89,93 @@ 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={
 "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":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)
+]
+}
+ui_tab_left={
+"deadzone": 0.5,
+"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(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)
 ]
 }