diff --git a/core/audio/settings/audio_option.tscn b/core/audio/settings/audio_option.tscn deleted file mode 100644 index c339962..0000000 --- a/core/audio/settings/audio_option.tscn +++ /dev/null @@ -1,14 +0,0 @@ -[gd_scene format=3 uid="uid://cescrovsjlwke"] - -[ext_resource type="Script" uid="uid://bnh1y560h55vc" path="res://core/audio/settings/audio_option.gd" id="1_orafl"] - -[node name="AudioOption" type="VBoxContainer" unique_id=1509773712] -custom_minimum_size = Vector2(300, 0) -script = ExtResource("1_orafl") - -[node name="Label" type="Label" parent="." unique_id=781845786] -layout_mode = 2 -text = "Master Volume" - -[node name="HSlider" type="HSlider" parent="." unique_id=1286896253] -layout_mode = 2 diff --git a/core/audio/settings/settings_menu.tscn b/core/audio/settings/settings_menu.tscn deleted file mode 100644 index 8143580..0000000 --- a/core/audio/settings/settings_menu.tscn +++ /dev/null @@ -1,74 +0,0 @@ -[gd_scene format=3 uid="uid://caqf471x0kttc"] - -[ext_resource type="Script" uid="uid://cvr25q1blyxg" path="res://core/audio/settings/settings_menu.gd" id="1_4lekq"] -[ext_resource type="PackedScene" uid="uid://cescrovsjlwke" path="res://core/audio/settings/audio_option.tscn" id="1_hwcco"] - -[node name="SettingsMenu" type="Control" unique_id=1639777294] -layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -script = ExtResource("1_4lekq") - -[node name="PanelContainer" type="PanelContainer" parent="." unique_id=315821242] -layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -79.5 -offset_top = -110.0 -offset_right = 79.5 -offset_bottom = 110.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="MarginContainer" type="MarginContainer" parent="PanelContainer" unique_id=648635784] -layout_mode = 2 -size_flags_vertical = 0 -theme_override_constants/margin_left = 12 -theme_override_constants/margin_top = 12 -theme_override_constants/margin_right = 12 -theme_override_constants/margin_bottom = 12 - -[node name="AudioOptionsContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer" unique_id=824023653] -unique_name_in_owner = true -layout_mode = 2 -theme_override_constants/separation = 12 - -[node name="MasterVolume_AudioOption" parent="PanelContainer/MarginContainer/AudioOptionsContainer" unique_id=1509773712 instance=ExtResource("1_hwcco")] -layout_mode = 2 - -[node name="HSeparator" type="HSeparator" parent="PanelContainer/MarginContainer/AudioOptionsContainer" unique_id=1053430754] -layout_mode = 2 - -[node name="MusicVolume_AudioOption" parent="PanelContainer/MarginContainer/AudioOptionsContainer" unique_id=690924616 instance=ExtResource("1_hwcco")] -layout_mode = 2 -bus_name = &"Music" -label_text = "Music Volume" - -[node name="HSeparator2" type="HSeparator" parent="PanelContainer/MarginContainer/AudioOptionsContainer" unique_id=453716295] -layout_mode = 2 - -[node name="SFXVolume_AudioOption" parent="PanelContainer/MarginContainer/AudioOptionsContainer" unique_id=2096291127 instance=ExtResource("1_hwcco")] -layout_mode = 2 -bus_name = &"SFX" -label_text = "SFX Volume" - -[node name="HSeparator3" type="HSeparator" parent="PanelContainer/MarginContainer/AudioOptionsContainer" unique_id=498553283] -layout_mode = 2 - -[node name="ResetToDefault_Button" type="Button" parent="PanelContainer/MarginContainer/AudioOptionsContainer" unique_id=720420423] -unique_name_in_owner = true -layout_mode = 2 -size_flags_horizontal = 0 -text = "Reset To Default" - -[node name="Close_Button" type="Button" parent="PanelContainer/MarginContainer/AudioOptionsContainer" unique_id=1137906684] -unique_name_in_owner = true -layout_mode = 2 -size_flags_horizontal = 0 -text = "Close" diff --git a/core/game_menu/assets/page_3/aliasing_button.png b/core/game_menu/assets/page_3/aliasing_button.png new file mode 100644 index 0000000..92db2c3 Binary files /dev/null and b/core/game_menu/assets/page_3/aliasing_button.png differ diff --git a/core/game_menu/assets/page_3/aliasing_button.png.import b/core/game_menu/assets/page_3/aliasing_button.png.import new file mode 100644 index 0000000..ba0ac14 --- /dev/null +++ b/core/game_menu/assets/page_3/aliasing_button.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c0s17sglugylc" +path="res://.godot/imported/aliasing_button.png-a39719a2937a6047be3c14c83afcf5aa.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/aliasing_button.png" +dest_files=["res://.godot/imported/aliasing_button.png-a39719a2937a6047be3c14c83afcf5aa.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/barretta.png b/core/game_menu/assets/page_3/barretta.png new file mode 100644 index 0000000..6b7ad64 Binary files /dev/null and b/core/game_menu/assets/page_3/barretta.png differ diff --git a/core/game_menu/assets/page_3/barretta.png.import b/core/game_menu/assets/page_3/barretta.png.import new file mode 100644 index 0000000..9c91b89 --- /dev/null +++ b/core/game_menu/assets/page_3/barretta.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c6kgm3fq8521h" +path="res://.godot/imported/barretta.png-8452363754c4e67034403e1217daa04a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/barretta.png" +dest_files=["res://.godot/imported/barretta.png-8452363754c4e67034403e1217daa04a.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/bg_timbri.png b/core/game_menu/assets/page_3/bg_timbri.png new file mode 100644 index 0000000..50c9041 Binary files /dev/null and b/core/game_menu/assets/page_3/bg_timbri.png differ diff --git a/core/game_menu/assets/page_3/bg_timbri.png.import b/core/game_menu/assets/page_3/bg_timbri.png.import new file mode 100644 index 0000000..162a51d --- /dev/null +++ b/core/game_menu/assets/page_3/bg_timbri.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://fpnhk1ygcrmu" +path="res://.godot/imported/bg_timbri.png-1aedde1b98fb4a6e8379f2b9abe711fb.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/bg_timbri.png" +dest_files=["res://.godot/imported/bg_timbri.png-1aedde1b98fb4a6e8379f2b9abe711fb.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/button (1).png b/core/game_menu/assets/page_3/button (1).png new file mode 100644 index 0000000..790b0ec Binary files /dev/null and b/core/game_menu/assets/page_3/button (1).png differ diff --git a/core/game_menu/assets/page_3/button (1).png.import b/core/game_menu/assets/page_3/button (1).png.import new file mode 100644 index 0000000..122bab9 --- /dev/null +++ b/core/game_menu/assets/page_3/button (1).png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://f6434r8qr1wu" +path="res://.godot/imported/button (1).png-45c7746e3094b4f06b4476b2eac0de6f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/button (1).png" +dest_files=["res://.godot/imported/button (1).png-45c7746e3094b4f06b4476b2eac0de6f.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/button (2).png b/core/game_menu/assets/page_3/button (2).png new file mode 100644 index 0000000..16fed87 Binary files /dev/null and b/core/game_menu/assets/page_3/button (2).png differ diff --git a/core/game_menu/assets/page_3/button (2).png.import b/core/game_menu/assets/page_3/button (2).png.import new file mode 100644 index 0000000..8494cdb --- /dev/null +++ b/core/game_menu/assets/page_3/button (2).png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bfrekg3j72evy" +path="res://.godot/imported/button (2).png-86c1ff83768903d13ebe9e33921c6f2f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/button (2).png" +dest_files=["res://.godot/imported/button (2).png-86c1ff83768903d13ebe9e33921c6f2f.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/button (3).png b/core/game_menu/assets/page_3/button (3).png new file mode 100644 index 0000000..57e7932 Binary files /dev/null and b/core/game_menu/assets/page_3/button (3).png differ diff --git a/core/game_menu/assets/page_3/button (3).png.import b/core/game_menu/assets/page_3/button (3).png.import new file mode 100644 index 0000000..3d1d4e4 --- /dev/null +++ b/core/game_menu/assets/page_3/button (3).png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c1sd0g86pxg78" +path="res://.godot/imported/button (3).png-779f246eecfffb2ad9c27b4d3311e9ec.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/button (3).png" +dest_files=["res://.godot/imported/button (3).png-779f246eecfffb2ad9c27b4d3311e9ec.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/button (4).png b/core/game_menu/assets/page_3/button (4).png new file mode 100644 index 0000000..aeed440 Binary files /dev/null and b/core/game_menu/assets/page_3/button (4).png differ diff --git a/core/game_menu/assets/page_3/button (4).png.import b/core/game_menu/assets/page_3/button (4).png.import new file mode 100644 index 0000000..7048e85 --- /dev/null +++ b/core/game_menu/assets/page_3/button (4).png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://3aku1hca287d" +path="res://.godot/imported/button (4).png-93932eed3fd313bb53170dff8b201262.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/button (4).png" +dest_files=["res://.godot/imported/button (4).png-93932eed3fd313bb53170dff8b201262.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/button (5).png b/core/game_menu/assets/page_3/button (5).png new file mode 100644 index 0000000..8467114 Binary files /dev/null and b/core/game_menu/assets/page_3/button (5).png differ diff --git a/core/game_menu/assets/page_3/button (5).png.import b/core/game_menu/assets/page_3/button (5).png.import new file mode 100644 index 0000000..3557945 --- /dev/null +++ b/core/game_menu/assets/page_3/button (5).png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cqdasd3gqhvn4" +path="res://.godot/imported/button (5).png-2d9a524d28fa475c356f82ec97837919.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/button (5).png" +dest_files=["res://.godot/imported/button (5).png-2d9a524d28fa475c356f82ec97837919.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/button (6).png b/core/game_menu/assets/page_3/button (6).png new file mode 100644 index 0000000..bc62408 Binary files /dev/null and b/core/game_menu/assets/page_3/button (6).png differ diff --git a/core/game_menu/assets/page_3/button (6).png.import b/core/game_menu/assets/page_3/button (6).png.import new file mode 100644 index 0000000..1aa32c5 --- /dev/null +++ b/core/game_menu/assets/page_3/button (6).png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bix4gs75vp877" +path="res://.godot/imported/button (6).png-b2e64de0e22a850923c62d0ac8df2191.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/button (6).png" +dest_files=["res://.godot/imported/button (6).png-b2e64de0e22a850923c62d0ac8df2191.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/main_volume_button.png b/core/game_menu/assets/page_3/main_volume_button.png new file mode 100644 index 0000000..557d143 Binary files /dev/null and b/core/game_menu/assets/page_3/main_volume_button.png differ diff --git a/core/game_menu/assets/page_3/main_volume_button.png.import b/core/game_menu/assets/page_3/main_volume_button.png.import new file mode 100644 index 0000000..8750d2b --- /dev/null +++ b/core/game_menu/assets/page_3/main_volume_button.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dirbxw8ii87nv" +path="res://.godot/imported/main_volume_button.png-44073461cc250b89877c6549307ab3d9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/main_volume_button.png" +dest_files=["res://.godot/imported/main_volume_button.png-44073461cc250b89877c6549307ab3d9.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/music_volume_button.png b/core/game_menu/assets/page_3/music_volume_button.png new file mode 100644 index 0000000..ad2d9ea Binary files /dev/null and b/core/game_menu/assets/page_3/music_volume_button.png differ diff --git a/core/game_menu/assets/page_3/music_volume_button.png.import b/core/game_menu/assets/page_3/music_volume_button.png.import new file mode 100644 index 0000000..943d588 --- /dev/null +++ b/core/game_menu/assets/page_3/music_volume_button.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://0t00kjvrw206" +path="res://.godot/imported/music_volume_button.png-33de58196bfa768feef0ab6d956d03ad.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/music_volume_button.png" +dest_files=["res://.godot/imported/music_volume_button.png-33de58196bfa768feef0ab6d956d03ad.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/play_button.png b/core/game_menu/assets/page_3/play_button.png new file mode 100644 index 0000000..2dad0a5 Binary files /dev/null and b/core/game_menu/assets/page_3/play_button.png differ diff --git a/core/game_menu/assets/page_3/play_button.png.import b/core/game_menu/assets/page_3/play_button.png.import new file mode 100644 index 0000000..741ce06 --- /dev/null +++ b/core/game_menu/assets/page_3/play_button.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b4nymq3n3468g" +path="res://.godot/imported/play_button.png-82e465772d390dd18294ef73027d355d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/play_button.png" +dest_files=["res://.godot/imported/play_button.png-82e465772d390dd18294ef73027d355d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/quad_main.png b/core/game_menu/assets/page_3/quad_main.png new file mode 100644 index 0000000..db661ea Binary files /dev/null and b/core/game_menu/assets/page_3/quad_main.png differ diff --git a/core/game_menu/assets/page_3/quad_main.png.import b/core/game_menu/assets/page_3/quad_main.png.import new file mode 100644 index 0000000..bb8ec24 --- /dev/null +++ b/core/game_menu/assets/page_3/quad_main.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d4e1lbng4uqk" +path="res://.godot/imported/quad_main.png-af26b29d5c3350fc4d75e08ad350ccc7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/quad_main.png" +dest_files=["res://.godot/imported/quad_main.png-af26b29d5c3350fc4d75e08ad350ccc7.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/quality_button.png b/core/game_menu/assets/page_3/quality_button.png new file mode 100644 index 0000000..8eb45a1 Binary files /dev/null and b/core/game_menu/assets/page_3/quality_button.png differ diff --git a/core/game_menu/assets/page_3/quality_button.png.import b/core/game_menu/assets/page_3/quality_button.png.import new file mode 100644 index 0000000..e87c8d2 --- /dev/null +++ b/core/game_menu/assets/page_3/quality_button.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dqqs83gh5mwof" +path="res://.godot/imported/quality_button.png-362af22cd4764f63b4532bc0ac31582c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/quality_button.png" +dest_files=["res://.godot/imported/quality_button.png-362af22cd4764f63b4532bc0ac31582c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/quit_button.png b/core/game_menu/assets/page_3/quit_button.png new file mode 100644 index 0000000..00afff9 Binary files /dev/null and b/core/game_menu/assets/page_3/quit_button.png differ diff --git a/core/game_menu/assets/page_3/quit_button.png.import b/core/game_menu/assets/page_3/quit_button.png.import new file mode 100644 index 0000000..7a47413 --- /dev/null +++ b/core/game_menu/assets/page_3/quit_button.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://v7e7467fkdec" +path="res://.godot/imported/quit_button.png-2a20552d77fd0a6b363d07491f42c8a1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/quit_button.png" +dest_files=["res://.godot/imported/quit_button.png-2a20552d77fd0a6b363d07491f42c8a1.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/resolution_button.png b/core/game_menu/assets/page_3/resolution_button.png new file mode 100644 index 0000000..847f3e2 Binary files /dev/null and b/core/game_menu/assets/page_3/resolution_button.png differ diff --git a/core/game_menu/assets/page_3/resolution_button.png.import b/core/game_menu/assets/page_3/resolution_button.png.import new file mode 100644 index 0000000..8d4ca78 --- /dev/null +++ b/core/game_menu/assets/page_3/resolution_button.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bohvj2bmao03f" +path="res://.godot/imported/resolution_button.png-48bd04fd62af50e2585326b54ad8130f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/resolution_button.png" +dest_files=["res://.godot/imported/resolution_button.png-48bd04fd62af50e2585326b54ad8130f.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/resume_button.png b/core/game_menu/assets/page_3/resume_button.png new file mode 100644 index 0000000..daa9e28 Binary files /dev/null and b/core/game_menu/assets/page_3/resume_button.png differ diff --git a/core/game_menu/assets/page_3/resume_button.png.import b/core/game_menu/assets/page_3/resume_button.png.import new file mode 100644 index 0000000..43d367f --- /dev/null +++ b/core/game_menu/assets/page_3/resume_button.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dd1exrppb6bjq" +path="res://.godot/imported/resume_button.png-5853ddda1af64d88914e53ef9dc0a492.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/resume_button.png" +dest_files=["res://.godot/imported/resume_button.png-5853ddda1af64d88914e53ef9dc0a492.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/save_button.png b/core/game_menu/assets/page_3/save_button.png new file mode 100644 index 0000000..bc6adc9 Binary files /dev/null and b/core/game_menu/assets/page_3/save_button.png differ diff --git a/core/game_menu/assets/page_3/save_button.png.import b/core/game_menu/assets/page_3/save_button.png.import new file mode 100644 index 0000000..709f5b9 --- /dev/null +++ b/core/game_menu/assets/page_3/save_button.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cmhx3mscwrwft" +path="res://.godot/imported/save_button.png-c52446515434dcf9eedf3abfd1c43af1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/save_button.png" +dest_files=["res://.godot/imported/save_button.png-c52446515434dcf9eedf3abfd1c43af1.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/settings_button.png b/core/game_menu/assets/page_3/settings_button.png new file mode 100644 index 0000000..83ee667 Binary files /dev/null and b/core/game_menu/assets/page_3/settings_button.png differ diff --git a/core/game_menu/assets/page_3/settings_button.png.import b/core/game_menu/assets/page_3/settings_button.png.import new file mode 100644 index 0000000..3dec619 --- /dev/null +++ b/core/game_menu/assets/page_3/settings_button.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cu8e7pl0y4owq" +path="res://.godot/imported/settings_button.png-7433e4d2dccc6b81934f5bd0fe0f6155.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/settings_button.png" +dest_files=["res://.godot/imported/settings_button.png-7433e4d2dccc6b81934f5bd0fe0f6155.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/sfx_volume_button.png b/core/game_menu/assets/page_3/sfx_volume_button.png new file mode 100644 index 0000000..812ff64 Binary files /dev/null and b/core/game_menu/assets/page_3/sfx_volume_button.png differ diff --git a/core/game_menu/assets/page_3/sfx_volume_button.png.import b/core/game_menu/assets/page_3/sfx_volume_button.png.import new file mode 100644 index 0000000..318f1cf --- /dev/null +++ b/core/game_menu/assets/page_3/sfx_volume_button.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dvergpy6qgggn" +path="res://.godot/imported/sfx_volume_button.png-1b0e51859f3551c1d1e4537a0e95499b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/sfx_volume_button.png" +dest_files=["res://.godot/imported/sfx_volume_button.png-1b0e51859f3551c1d1e4537a0e95499b.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/audio/settings/audio_option.gd b/core/game_menu/audio_option.gd similarity index 81% rename from core/audio/settings/audio_option.gd rename to core/game_menu/audio_option.gd index 1c386ff..42ef7df 100644 --- a/core/audio/settings/audio_option.gd +++ b/core/game_menu/audio_option.gd @@ -1,3 +1,4 @@ +@tool extends VBoxContainer class_name AudioOption @@ -5,27 +6,34 @@ class_name AudioOption const MIN_VOLUME: float = 0.0 const MAX_VOLUME: float = 1.0 +@export var image: Texture: + set(value): + image = value + if is_inside_tree() and has_node("%Texture"): + $%Texture.texture = image + @export var bus_name: StringName = &"Master" -@export var label_text: String = "Master Volume" @export_range(0.0, 1.0, 0.01) var default_volume: float = 1.0 -@onready var label: Label = $Label @onready var slider: HSlider = $HSlider func _ready() -> void: + if image != null and has_node("%Texture"): + $%Texture.texture = image + + if Engine.is_editor_hint(): + return + slider.min_value = MIN_VOLUME slider.max_value = MAX_VOLUME slider.step = 0.01 slider.value_changed.connect(_on_slider_value_changed) refresh() - + func refresh() -> void: - label.text = label_text - if not has_bus(): slider.set_value_no_signal(default_volume) slider.editable = false - label.text = "%s (bus missing)" % label_text return slider.editable = true @@ -46,6 +54,9 @@ func get_bus_index() -> int: return AudioServer.get_bus_index(bus_name) func _set_bus_volume(linear_value: float) -> void: + if Engine.is_editor_hint(): + return + if not has_bus(): return diff --git a/core/audio/settings/audio_option.gd.uid b/core/game_menu/audio_option.gd.uid similarity index 100% rename from core/audio/settings/audio_option.gd.uid rename to core/game_menu/audio_option.gd.uid diff --git a/core/game_menu/audio_option.tscn b/core/game_menu/audio_option.tscn new file mode 100644 index 0000000..32a96be --- /dev/null +++ b/core/game_menu/audio_option.tscn @@ -0,0 +1,43 @@ +[gd_scene format=3 uid="uid://cescrovsjlwke"] + +[ext_resource type="Script" uid="uid://bnh1y560h55vc" path="res://core/game_menu/audio_option.gd" id="1_orafl"] +[ext_resource type="Texture2D" uid="uid://dirbxw8ii87nv" path="res://core/game_menu/assets/page_3/main_volume_button.png" id="2_vudub"] +[ext_resource type="Texture2D" uid="uid://f6434r8qr1wu" path="res://core/game_menu/assets/page_3/button (1).png" id="3_vf41c"] +[ext_resource type="Texture2D" uid="uid://c6kgm3fq8521h" path="res://core/game_menu/assets/page_3/barretta.png" id="4_hduhm"] + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_f3y2u"] +content_margin_left = 0.0 +content_margin_right = 0.0 +content_margin_bottom = 0.0 +texture = ExtResource("4_hduhm") +texture_margin_top = 23.0 + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_tj25j"] +texture = ExtResource("4_hduhm") + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_4fmty"] +texture = ExtResource("4_hduhm") + +[node name="AudioOption" type="VBoxContainer" unique_id=1509773712] +offset_right = 319.0 +offset_bottom = 177.0 +theme_override_constants/separation = 0 +script = ExtResource("1_orafl") +image = ExtResource("2_vudub") + +[node name="Texture" type="TextureRect" parent="." unique_id=637050541] +unique_name_in_owner = true +layout_mode = 2 +texture = ExtResource("2_vudub") +stretch_mode = 5 + +[node name="HSlider" type="HSlider" parent="." unique_id=1286896253] +layout_mode = 2 +theme_override_icons/grabber = ExtResource("3_vf41c") +theme_override_icons/grabber_highlight = ExtResource("3_vf41c") +theme_override_icons/grabber_disabled = ExtResource("3_vf41c") +theme_override_styles/slider = SubResource("StyleBoxTexture_f3y2u") +theme_override_styles/grabber_area = SubResource("StyleBoxTexture_tj25j") +theme_override_styles/grabber_area_highlight = SubResource("StyleBoxTexture_4fmty") +max_value = 1.0 +step = 0.01 diff --git a/core/game_menu/game_menu.gd b/core/game_menu/game_menu.gd new file mode 100644 index 0000000..e223b46 --- /dev/null +++ b/core/game_menu/game_menu.gd @@ -0,0 +1,22 @@ +extends Control + +@onready var tabs: Array[GameMenuTab] = [$%Tab1, $%Tab2, $%Tab3] +@onready var pages: Array[Control] = [$%Page1, $%Page2, $%Page3] + +func _ready() -> void: + for tab: GameMenuTab in tabs: + tab.on_tab_selected.connect(_on_tab_pressed) + + tabs[0].select() + +func _on_tab_pressed(index: int): + for page in pages: + page.hide() + + for tab in tabs: + if tab.index == index: + tab.select() + else: + tab.deselect() + + pages[index].show() diff --git a/core/game_menu/game_menu.gd.uid b/core/game_menu/game_menu.gd.uid new file mode 100644 index 0000000..b71de0d --- /dev/null +++ b/core/game_menu/game_menu.gd.uid @@ -0,0 +1 @@ +uid://dfb61nn3wfbje diff --git a/core/game_menu/game_menu.tscn b/core/game_menu/game_menu.tscn index 8ffc63a..051fcf1 100644 --- a/core/game_menu/game_menu.tscn +++ b/core/game_menu/game_menu.tscn @@ -1,9 +1,13 @@ [gd_scene format=3 uid="uid://dqqm4o8j45tr6"] [ext_resource type="Texture2D" uid="uid://bs56pdbywm4uh" path="res://core/game_menu/assets/page_1/quad_main.png" id="1_0ojv5"] -[ext_resource type="PackedScene" uid="uid://5ks773lxu6fg" path="res://core/game_menu/tabs.tscn" id="1_worvp"] +[ext_resource type="Script" uid="uid://dfb61nn3wfbje" path="res://core/game_menu/game_menu.gd" id="1_57vaj"] [ext_resource type="PackedScene" uid="uid://bqvpnu74cwry8" path="res://core/game_menu/page_1.tscn" id="3_quxs6"] +[ext_resource type="PackedScene" uid="uid://dr5b6jnh7rcko" path="res://core/game_menu/game_menu_tab.tscn" id="3_xmmnr"] [ext_resource type="PackedScene" uid="uid://4bamw5busnvc" path="res://core/game_menu/page_2.tscn" id="4_ilf85"] +[ext_resource type="Texture2D" uid="uid://bdfsfteuwk5bu" path="res://core/game_menu/assets/page_1/ticket3.png" id="4_y36g7"] +[ext_resource type="Texture2D" uid="uid://dq7owenentst2" path="res://core/game_menu/assets/page_1/ticket2.png" id="5_7d256"] +[ext_resource type="PackedScene" uid="uid://c8b5sqnocx8dr" path="res://core/game_menu/page_3.tscn" id="5_yq2ch"] [node name="GameMenu" type="Control" unique_id=2124096517] layout_mode = 3 @@ -12,20 +16,37 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +mouse_filter = 2 +script = ExtResource("1_57vaj") -[node name="Tabs" parent="." unique_id=1517899336 instance=ExtResource("1_worvp")] -layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = 240.0 -offset_top = -308.0 -offset_right = 240.0 -offset_bottom = -308.0 -grow_horizontal = 2 -grow_vertical = 2 +[node name="Tabs" type="HBoxContainer" parent="." unique_id=1745270897] +layout_mode = 0 +offset_left = 1146.0 +offset_top = 214.0 +offset_right = 1754.0 +offset_bottom = 254.0 + +[node name="Tab1" parent="Tabs" unique_id=2026548604 instance=ExtResource("3_xmmnr")] +unique_name_in_owner = true +custom_minimum_size = Vector2(200, 0) +layout_mode = 2 +size_flags_horizontal = 3 +image = ExtResource("4_y36g7") + +[node name="Tab2" parent="Tabs" unique_id=640092511 instance=ExtResource("3_xmmnr")] +unique_name_in_owner = true +custom_minimum_size = Vector2(200, 0) +layout_mode = 2 +size_flags_horizontal = 3 +index = 1 + +[node name="Tab3" parent="Tabs" unique_id=1769860923 instance=ExtResource("3_xmmnr")] +unique_name_in_owner = true +custom_minimum_size = Vector2(200, 0) +layout_mode = 2 +size_flags_horizontal = 3 +index = 2 +image = ExtResource("5_7d256") [node name="Background" type="TextureRect" parent="." unique_id=1059942660] layout_mode = 1 @@ -34,6 +55,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +mouse_filter = 2 texture = ExtResource("1_0ojv5") [node name="Pages" type="Control" parent="." unique_id=1744911944] @@ -43,10 +65,22 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +mouse_filter = 2 [node name="Page1" parent="Pages" unique_id=2037261222 instance=ExtResource("3_quxs6")] +unique_name_in_owner = true visible = false layout_mode = 1 +mouse_filter = 2 [node name="Page2" parent="Pages" unique_id=1254645647 instance=ExtResource("4_ilf85")] +unique_name_in_owner = true +visible = false layout_mode = 1 +mouse_filter = 2 + +[node name="Page3" parent="Pages" unique_id=381047815 instance=ExtResource("5_yq2ch")] +unique_name_in_owner = true +visible = false +layout_mode = 1 +mouse_filter = 2 diff --git a/core/game_menu/game_menu_tab.gd b/core/game_menu/game_menu_tab.gd new file mode 100644 index 0000000..982cd2d --- /dev/null +++ b/core/game_menu/game_menu_tab.gd @@ -0,0 +1,28 @@ +@tool +extends Control + +class_name GameMenuTab + +signal on_tab_selected(index: int) + +@export var index: int = 0 +@export var image: Texture: + set(value): + image = value + if is_inside_tree() and has_node("%Texture"): + $%Texture.texture_normal = image + +var is_selected: bool = false + +func _ready(): + if image != null and has_node("%Texture"): + $%Texture.texture_normal = image + +func _on_texture_pressed() -> void: + on_tab_selected.emit(index) + +func select(): + is_selected = true + +func deselect(): + is_selected = false diff --git a/core/game_menu/tab.gd.uid b/core/game_menu/game_menu_tab.gd.uid similarity index 100% rename from core/game_menu/tab.gd.uid rename to core/game_menu/game_menu_tab.gd.uid diff --git a/core/game_menu/tab.tscn b/core/game_menu/game_menu_tab.tscn similarity index 50% rename from core/game_menu/tab.tscn rename to core/game_menu/game_menu_tab.tscn index 5dda982..e631446 100644 --- a/core/game_menu/tab.tscn +++ b/core/game_menu/game_menu_tab.tscn @@ -1,17 +1,20 @@ [gd_scene format=3 uid="uid://dr5b6jnh7rcko"] -[ext_resource type="Script" uid="uid://37s131g0d5lh" path="res://core/game_menu/tab.gd" id="1_5bcha"] +[ext_resource type="Script" uid="uid://37s131g0d5lh" path="res://core/game_menu/game_menu_tab.gd" id="1_5bcha"] [ext_resource type="Texture2D" uid="uid://ce1u34fp1h2o5" path="res://core/game_menu/assets/page_1/ticket1.png" id="2_giv8b"] -[node name="Tab" type="Control" unique_id=2026548604] +[node name="GameMenuTab" type="Control" unique_id=2026548604] layout_mode = 3 anchors_preset = 0 script = ExtResource("1_5bcha") image = ExtResource("2_giv8b") -[node name="Texture" type="TextureRect" parent="." unique_id=1837700127] +[node name="Texture" type="TextureButton" parent="." unique_id=1234672875] unique_name_in_owner = true layout_mode = 0 -offset_right = 40.0 -offset_bottom = 40.0 -texture = ExtResource("2_giv8b") +offset_right = 196.0 +offset_bottom = 438.0 +texture_normal = ExtResource("2_giv8b") +stretch_mode = 5 + +[connection signal="pressed" from="Texture" to="." method="_on_texture_pressed"] diff --git a/core/game_menu/option_menu.tscn b/core/game_menu/option_menu.tscn new file mode 100644 index 0000000..a5dde4a --- /dev/null +++ b/core/game_menu/option_menu.tscn @@ -0,0 +1,35 @@ +[gd_scene format=3 uid="uid://cxf8s80ivwj1p"] + +[ext_resource type="Texture2D" uid="uid://b4nymq3n3468g" path="res://core/game_menu/assets/page_3/play_button.png" id="1_xquiw"] +[ext_resource type="Texture2D" uid="uid://dd1exrppb6bjq" path="res://core/game_menu/assets/page_3/resume_button.png" id="2_htoi2"] +[ext_resource type="Texture2D" uid="uid://cmhx3mscwrwft" path="res://core/game_menu/assets/page_3/save_button.png" id="3_vwpol"] +[ext_resource type="Texture2D" uid="uid://v7e7467fkdec" path="res://core/game_menu/assets/page_3/quit_button.png" id="4_cd2sv"] + +[node name="OptionMenu" type="Control" unique_id=1055457221] +layout_mode = 3 +anchors_preset = 0 + +[node name="VBoxContainer" type="VBoxContainer" parent="." unique_id=508055524] +layout_mode = 1 +offset_right = 303.0 +offset_bottom = 373.0 + +[node name="PlayButton" type="TextureButton" parent="VBoxContainer" unique_id=46341665] +layout_mode = 2 +texture_normal = ExtResource("1_xquiw") +stretch_mode = 5 + +[node name="ResumeButton" type="TextureButton" parent="VBoxContainer" unique_id=814859927] +layout_mode = 2 +texture_normal = ExtResource("2_htoi2") +stretch_mode = 5 + +[node name="SaveButton" type="TextureButton" parent="VBoxContainer" unique_id=1971935142] +layout_mode = 2 +texture_normal = ExtResource("3_vwpol") +stretch_mode = 5 + +[node name="QuitButton" type="TextureButton" parent="VBoxContainer" unique_id=404231737] +layout_mode = 2 +texture_normal = ExtResource("4_cd2sv") +stretch_mode = 5 diff --git a/core/game_menu/page.tscn b/core/game_menu/page.tscn index c45a95a..9f0cb35 100644 --- a/core/game_menu/page.tscn +++ b/core/game_menu/page.tscn @@ -9,6 +9,7 @@ offset_right = 40.0 offset_bottom = 40.0 [node name="Background" type="TextureRect" parent="." unique_id=1203110384] +visible = false layout_mode = 0 offset_right = 40.0 offset_bottom = 40.0 diff --git a/core/game_menu/page_3.tscn b/core/game_menu/page_3.tscn new file mode 100644 index 0000000..33fdcc2 --- /dev/null +++ b/core/game_menu/page_3.tscn @@ -0,0 +1,37 @@ +[gd_scene format=3 uid="uid://c8b5sqnocx8dr"] + +[ext_resource type="PackedScene" uid="uid://id854u4gh12f" path="res://core/game_menu/page.tscn" id="1_ua8fn"] +[ext_resource type="Texture2D" uid="uid://fpnhk1ygcrmu" path="res://core/game_menu/assets/page_3/bg_timbri.png" id="2_ckqcb"] +[ext_resource type="PackedScene" uid="uid://cxf8s80ivwj1p" path="res://core/game_menu/option_menu.tscn" id="2_tymfi"] +[ext_resource type="PackedScene" uid="uid://caqf471x0kttc" path="res://core/game_menu/settings_menu.tscn" id="4_twko7"] + +[node name="Page3" unique_id=2037261222 instance=ExtResource("1_ua8fn")] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_right = 0.0 +offset_bottom = 0.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="TextureRect" type="TextureRect" parent="." index="1" unique_id=464034413] +layout_mode = 0 +offset_left = 1040.0 +offset_top = 309.0 +offset_right = 1738.0 +offset_bottom = 836.0 +texture = ExtResource("2_ckqcb") + +[node name="OptionMenu" parent="." index="2" unique_id=1055457221 instance=ExtResource("2_tymfi")] +layout_mode = 0 +offset_left = 1202.0 +offset_top = 392.0 +offset_right = 1202.0 +offset_bottom = 392.0 + +[node name="SettingsMenu" parent="." index="3" unique_id=1639777294 instance=ExtResource("4_twko7")] +layout_mode = 1 +offset_left = 365.0 +offset_top = 304.0 +offset_right = 365.0 +offset_bottom = 304.0 diff --git a/core/audio/settings/settings_menu.gd b/core/game_menu/settings_menu.gd similarity index 59% rename from core/audio/settings/settings_menu.gd rename to core/game_menu/settings_menu.gd index ea9501e..6327c27 100644 --- a/core/audio/settings/settings_menu.gd +++ b/core/game_menu/settings_menu.gd @@ -3,12 +3,8 @@ extends Control class_name SettingsMenu @onready var audio_options_container: VBoxContainer = $%AudioOptionsContainer -@onready var reset_button: Button = $%ResetToDefault_Button -@onready var close_button: Button = $%Close_Button func _ready() -> void: - reset_button.pressed.connect(_on_reset_to_default_button_pressed) - close_button.pressed.connect(_on_close_button_pressed) _refresh_audio_options() func _get_audio_options() -> Array[AudioOption]: @@ -27,10 +23,3 @@ func _refresh_audio_options() -> void: func _apply_current_audio_values() -> void: for audio_option in _get_audio_options(): audio_option.apply_current_value() - -func _on_reset_to_default_button_pressed() -> void: - for audio_option in _get_audio_options(): - audio_option.reset_to_default() - -func _on_close_button_pressed() -> void: - visible = false diff --git a/core/audio/settings/settings_menu.gd.uid b/core/game_menu/settings_menu.gd.uid similarity index 100% rename from core/audio/settings/settings_menu.gd.uid rename to core/game_menu/settings_menu.gd.uid diff --git a/core/game_menu/settings_menu.tscn b/core/game_menu/settings_menu.tscn new file mode 100644 index 0000000..13f901e --- /dev/null +++ b/core/game_menu/settings_menu.tscn @@ -0,0 +1,33 @@ +[gd_scene format=3 uid="uid://caqf471x0kttc"] + +[ext_resource type="Script" uid="uid://cvr25q1blyxg" path="res://core/game_menu/settings_menu.gd" id="1_4lekq"] +[ext_resource type="PackedScene" uid="uid://cescrovsjlwke" path="res://core/game_menu/audio_option.tscn" id="1_hwcco"] +[ext_resource type="Texture2D" uid="uid://0t00kjvrw206" path="res://core/game_menu/assets/page_3/music_volume_button.png" id="3_kgdba"] +[ext_resource type="Texture2D" uid="uid://dvergpy6qgggn" path="res://core/game_menu/assets/page_3/sfx_volume_button.png" id="4_ugk4n"] + +[node name="SettingsMenu" type="Control" unique_id=1639777294] +layout_mode = 3 +anchors_preset = 0 +offset_right = 600.0 +offset_bottom = 420.0 +script = ExtResource("1_4lekq") + +[node name="AudioOptionsContainer" type="VBoxContainer" parent="." unique_id=743642398] +unique_name_in_owner = true +layout_mode = 0 +offset_right = 327.0 +offset_bottom = 512.0 +theme_override_constants/separation = 12 + +[node name="MasterVolume_AudioOption" parent="AudioOptionsContainer" unique_id=1509773712 instance=ExtResource("1_hwcco")] +layout_mode = 2 + +[node name="MusicVolume_AudioOption" parent="AudioOptionsContainer" unique_id=690924616 instance=ExtResource("1_hwcco")] +layout_mode = 2 +image = ExtResource("3_kgdba") +bus_name = &"Music" + +[node name="SFXVolume_AudioOption" parent="AudioOptionsContainer" unique_id=2096291127 instance=ExtResource("1_hwcco")] +layout_mode = 2 +image = ExtResource("4_ugk4n") +bus_name = &"SFX" diff --git a/core/game_menu/tab.gd b/core/game_menu/tab.gd deleted file mode 100644 index 82e83f3..0000000 --- a/core/game_menu/tab.gd +++ /dev/null @@ -1,12 +0,0 @@ -@tool -extends Control - -@export var image: Texture: - set(value): - image = value - if is_inside_tree() and has_node("%Texture"): - $%Texture.texture = image - -func _ready(): - if image != null and has_node("%Texture"): - $%Texture.texture = image diff --git a/core/game_menu/tabs.tscn b/core/game_menu/tabs.tscn deleted file mode 100644 index 9d958dc..0000000 --- a/core/game_menu/tabs.tscn +++ /dev/null @@ -1,31 +0,0 @@ -[gd_scene format=3 uid="uid://5ks773lxu6fg"] - -[ext_resource type="PackedScene" uid="uid://dr5b6jnh7rcko" path="res://core/game_menu/tab.tscn" id="1_owa0n"] -[ext_resource type="Texture2D" uid="uid://dq7owenentst2" path="res://core/game_menu/assets/page_1/ticket2.png" id="2_sf413"] -[ext_resource type="Texture2D" uid="uid://bdfsfteuwk5bu" path="res://core/game_menu/assets/page_1/ticket3.png" id="3_el8oe"] - -[node name="Tabs" type="Control" unique_id=1517899336] -layout_mode = 3 -anchors_preset = 0 - -[node name="HBoxContainer" type="HBoxContainer" parent="." unique_id=1630839746] -layout_mode = 0 -offset_right = 40.0 -offset_bottom = 40.0 - -[node name="Tab" parent="HBoxContainer" unique_id=2026548604 instance=ExtResource("1_owa0n")] -custom_minimum_size = Vector2(200, 0) -layout_mode = 2 -size_flags_horizontal = 3 -image = ExtResource("3_el8oe") - -[node name="Tab2" parent="HBoxContainer" unique_id=650746277 instance=ExtResource("1_owa0n")] -custom_minimum_size = Vector2(200, 0) -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="Tab3" parent="HBoxContainer" unique_id=150028601 instance=ExtResource("1_owa0n")] -custom_minimum_size = Vector2(200, 0) -layout_mode = 2 -size_flags_horizontal = 3 -image = ExtResource("2_sf413") diff --git a/docs/gyms/radio/gym_radio.tscn b/docs/gyms/radio/gym_radio.tscn index 7289baa..1c9a650 100644 --- a/docs/gyms/radio/gym_radio.tscn +++ b/docs/gyms/radio/gym_radio.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://cpeyt1dgrtglc" path="res://core/radio/radio.tscn" id="1_8yomj"] [ext_resource type="Script" uid="uid://ew4b78u5tkiu" path="res://docs/gyms/radio/gym_radio.gd" id="1_h5r8c"] [ext_resource type="AudioStream" uid="uid://70cc8she43re" path="res://docs/gyms/radio/lofi_01.ogg" id="3_ltpvc"] -[ext_resource type="PackedScene" uid="uid://caqf471x0kttc" path="res://core/audio/settings/settings_menu.tscn" id="4_8pw2j"] +[ext_resource type="PackedScene" uid="uid://caqf471x0kttc" path="res://core/game_menu/settings_menu.tscn" id="4_8pw2j"] [node name="GymRadio" type="Node3D" unique_id=204859062] script = ExtResource("1_h5r8c")