Improve OptionsUI

+ Add dedicated script
+ Add Skip Music Button

Author: ShinryakuTako

UI/Menus/OptionsUI.tscn

@@ -1,5 +1,6 @@
-[gd_scene load_steps=3 format=3 uid="uid://cysctd14jlutm"]
+[gd_scene load_steps=4 format=3 uid="uid://cysctd14jlutm"]
 
+[ext_resource type="Script" uid="uid://cg3ii15hb36n5" path="res://UI/Menus/OptionsUi.gd" id="1_845vf"]
 [ext_resource type="PackedScene" uid="uid://cdj4v68mvmp1u" path="res://UI/Views/BusVolumeUI.tscn" id="2_845vf"]
 [ext_resource type="Script" uid="uid://ygfsiorvisq" path="res://UI/Buttons/UINavigationButton.gd" id="3_415it"]
 
@@ -11,6 +12,7 @@ grow_horizontal = 2
 grow_vertical = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
+script = ExtResource("1_845vf")
 metadata/_edit_group_ = true
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
@@ -23,10 +25,10 @@ theme_override_constants/margin_top = 8
 theme_override_constants/margin_right = 46
 theme_override_constants/margin_bottom = 8
 
-[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/VolumeContainerShifted"]
+[node name="VolumeContainer" type="VBoxContainer" parent="VBoxContainer/VolumeContainerShifted"]
 layout_mode = 2
 
-[node name="SoundVolumeUI" parent="VBoxContainer/VolumeContainerShifted/VBoxContainer" instance=ExtResource("2_845vf")]
+[node name="SoundVolumeUI" parent="VBoxContainer/VolumeContainerShifted/VolumeContainer" instance=ExtResource("2_845vf")]
 layout_mode = 2
 focus_neighbor_top = NodePath("../../../InputMapButton")
 focus_neighbor_bottom = NodePath("../MusicVolumeUI")
@@ -36,22 +38,35 @@ busIndex = 1
 busTitle = "SFX"
 settingsKey = &"sfxVolume"
 
-[node name="MusicVolumeUI" parent="VBoxContainer/VolumeContainerShifted/VBoxContainer" instance=ExtResource("2_845vf")]
+[node name="MusicVolumeUI" parent="VBoxContainer/VolumeContainerShifted/VolumeContainer" instance=ExtResource("2_845vf")]
 layout_mode = 2
 focus_neighbor_top = NodePath("../SoundVolumeUI")
-focus_neighbor_bottom = NodePath("../../../InputMapButton")
-focus_next = NodePath("../../../InputMapButton")
+focus_neighbor_bottom = NodePath("../../../SkipMusicButton")
+focus_next = NodePath("../../../SkipMusicButton")
 focus_previous = NodePath("../SoundVolumeUI")
 busTitle = "TUNES"
 settingsKey = &"musicVolume"
 
+[node name="SkipMusicButton" type="Button" parent="VBoxContainer"]
+custom_minimum_size = Vector2(72, 0)
+layout_mode = 2
+size_flags_horizontal = 4
+focus_neighbor_top = NodePath("../VolumeContainerShifted/VolumeContainer/MusicVolumeUI")
+focus_neighbor_bottom = NodePath("../InputMapButton")
+focus_next = NodePath("../InputMapButton")
+focus_previous = NodePath("../VolumeContainerShifted/VolumeContainer/MusicVolumeUI")
+text = "SKIP TUNE"
+
 [node name="InputMapButton" type="Button" parent="VBoxContainer"]
+custom_minimum_size = Vector2(72, 0)
 layout_mode = 2
 size_flags_horizontal = 4
-focus_neighbor_top = NodePath("../VolumeContainerShifted/VBoxContainer/MusicVolumeUI")
-focus_neighbor_bottom = NodePath("../VolumeContainerShifted/VBoxContainer/SoundVolumeUI")
-focus_next = NodePath("../VolumeContainerShifted/VBoxContainer/SoundVolumeUI")
-focus_previous = NodePath("../VolumeContainerShifted/VBoxContainer/MusicVolumeUI")
+focus_neighbor_top = NodePath("../SkipMusicButton")
+focus_neighbor_bottom = NodePath("../VolumeContainerShifted/VolumeContainer/SoundVolumeUI")
+focus_next = NodePath("../VolumeContainerShifted/VolumeContainer/SoundVolumeUI")
+focus_previous = NodePath("../SkipMusicButton")
 text = "CONTROLS"
 script = ExtResource("3_415it")
 navigationDestination = "uid://c0cldnfe77jwf"
+
+[connection signal="pressed" from="VBoxContainer/SkipMusicButton" to="." method="onSkipMusicButton_pressed"]

UI/Menus/OptionsUi.gd

@@ -0,0 +1,8 @@
+## The Options Menu which may be accessed from the Main Menu or the Pause screen.
+
+# class_name OptionsUI
+extends Container
+
+
+func onSkipMusicButton_pressed() -> void:
+	GlobalSonic.skipMusic()

UI/Menus/OptionsUi.gd.uid

@@ -0,0 +1 @@
+uid://cg3ii15hb36n5