From e40c044ad3ad80cff96bb20618b5911a95c01928 Mon Sep 17 00:00:00 2001 From: Ryan Reed Date: Sun, 30 Mar 2025 09:41:55 -0400 Subject: [PATCH] Migrating menus into Inherited scenes --- scenes/ui/pause_menu/base_menu.tscn | 152 +++++++++++++ scenes/ui/pause_menu/main_menu.tscn | 150 +------------ scenes/ui/pause_menu/pause_menu.tscn | 12 +- scenes/ui/pause_menu/saves_menu.tscn | 179 +++------------ scenes/ui/pause_menu/settings_menu.tscn | 277 ++++++------------------ 5 files changed, 263 insertions(+), 507 deletions(-) create mode 100644 scenes/ui/pause_menu/base_menu.tscn diff --git a/scenes/ui/pause_menu/base_menu.tscn b/scenes/ui/pause_menu/base_menu.tscn new file mode 100644 index 0000000..d2255eb --- /dev/null +++ b/scenes/ui/pause_menu/base_menu.tscn @@ -0,0 +1,152 @@ +[gd_scene load_steps=7 format=3 uid="uid://4itp2hjp14n2"] + +[ext_resource type="Theme" uid="uid://b5q8b0l6qp1dt" path="res://resources/pause_menu_theme.tres" id="1_3sxei"] +[ext_resource type="Script" uid="uid://c71f7fatmvsra" path="res://scenes/ui/pause_menu/base_menu.gd" id="2_3sxei"] + +[sub_resource type="Animation" id="Animation_vx2qe"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(-400, 0)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath(".:visible") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} + +[sub_resource type="Animation" id="Animation_q12vw"] +resource_name = "hide" +length = 0.2 +step = 0.05 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.2), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(0, 0), Vector2(-400, 0)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath(".:visible") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 0.2), +"transitions": PackedFloat32Array(1, 1), +"update": 1, +"values": [true, false] +} + +[sub_resource type="Animation" id="Animation_3mo8w"] +resource_name = "show" +length = 0.2 +step = 0.05 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.2), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(-400, 0), Vector2(0, 0)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath(".:visible") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_q12vw"] +_data = { +&"RESET": SubResource("Animation_vx2qe"), +&"hide": SubResource("Animation_q12vw"), +&"show": SubResource("Animation_3mo8w") +} + +[node name="BaseMenu" type="ColorRect" node_paths=PackedStringArray("animation_player")] +visible = false +custom_minimum_size = Vector2(400, 0) +anchors_preset = 9 +anchor_bottom = 1.0 +offset_left = -400.0 +grow_vertical = 2 +theme = ExtResource("1_3sxei") +color = Color(0.133333, 0.133333, 0.133333, 0.784314) +script = ExtResource("2_3sxei") +animation_player = NodePath("AnimationPlayer") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +libraries = { +&"": SubResource("AnimationLibrary_q12vw") +} +autoplay = "show" + +[node name="MainContent" type="MarginContainer" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_constants/margin_left = 10 +theme_override_constants/margin_top = 10 +theme_override_constants/margin_right = 10 +theme_override_constants/margin_bottom = 10 + +[node name="MenuContainer" type="VBoxContainer" parent="MainContent"] +layout_mode = 2 +size_flags_horizontal = 4 +theme_override_constants/separation = 20 + +[node name="Title" type="Label" parent="MainContent/MenuContainer"] +layout_mode = 2 +theme_type_variation = &"MenuTitle" +text = "Menu Title" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="BottomRow" type="MarginContainer" parent="."] +layout_mode = 1 +anchors_preset = 7 +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +offset_left = -82.5 +offset_top = -46.0 +offset_right = 82.5 +grow_horizontal = 2 +grow_vertical = 0 +theme_override_constants/margin_bottom = 10 diff --git a/scenes/ui/pause_menu/main_menu.tscn b/scenes/ui/pause_menu/main_menu.tscn index 38231b1..67a8a70 100644 --- a/scenes/ui/pause_menu/main_menu.tscn +++ b/scenes/ui/pause_menu/main_menu.tscn @@ -1,160 +1,32 @@ -[gd_scene load_steps=7 format=3 uid="uid://c36xeip0cq3ov"] +[gd_scene load_steps=3 format=3 uid="uid://xy8pdtxcepqf"] -[ext_resource type="Script" uid="uid://bwvwpiwhp52e" path="res://scenes/ui/pause_menu/main_menu.gd" id="1_qhoi0"] -[ext_resource type="Theme" uid="uid://b5q8b0l6qp1dt" path="res://resources/pause_menu_theme.tres" id="1_t42ad"] +[ext_resource type="PackedScene" uid="uid://4itp2hjp14n2" path="res://scenes/ui/pause_menu/base_menu.tscn" id="1_6fgdx"] +[ext_resource type="Script" uid="uid://bwvwpiwhp52e" path="res://scenes/ui/pause_menu/main_menu.gd" id="2_4i143"] -[sub_resource type="Animation" id="Animation_ightw"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector2(-400, 0)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:visible") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [false] -} +[node name="MainMenu" instance=ExtResource("1_6fgdx")] +script = ExtResource("2_4i143") -[sub_resource type="Animation" id="Animation_0jq6q"] -resource_name = "hide" -length = 0.2 -step = 0.05 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.2), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [Vector2(0, 0), Vector2(-400, 0)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:visible") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0, 0.2), -"transitions": PackedFloat32Array(1, 1), -"update": 1, -"values": [true, false] -} - -[sub_resource type="Animation" id="Animation_4xojl"] -resource_name = "show" -length = 0.2 -step = 0.05 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.2), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [Vector2(-400, 0), Vector2(0, 0)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:visible") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [true] -} - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_0jq6q"] -_data = { -&"RESET": SubResource("Animation_ightw"), -&"hide": SubResource("Animation_0jq6q"), -&"show": SubResource("Animation_4xojl") -} - -[node name="MainMenu" type="ColorRect" node_paths=PackedStringArray("animation_player")] -visible = false -custom_minimum_size = Vector2(400, 0) -anchors_preset = 9 -anchor_bottom = 1.0 -offset_left = -400.0 -grow_vertical = 2 -theme = ExtResource("1_t42ad") -color = Color(0.133333, 0.133333, 0.133333, 0.784314) -script = ExtResource("1_qhoi0") -animation_player = NodePath("AnimationPlayer") - -[node name="AnimationPlayer" type="AnimationPlayer" parent="."] -libraries = { -&"": SubResource("AnimationLibrary_0jq6q") -} -autoplay = "show" - -[node name="MainContent" type="MarginContainer" parent="."] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -theme_override_constants/margin_left = 10 -theme_override_constants/margin_top = 10 -theme_override_constants/margin_right = 10 -theme_override_constants/margin_bottom = 10 - -[node name="MenuContainer" type="VBoxContainer" parent="MainContent"] -layout_mode = 2 -size_flags_horizontal = 4 -theme_override_constants/separation = 20 - -[node name="Title" type="Label" parent="MainContent/MenuContainer"] -layout_mode = 2 -theme_type_variation = &"MenuTitle" +[node name="Title" parent="MainContent/MenuContainer" index="0"] text = "Paused" -horizontal_alignment = 1 -vertical_alignment = 1 -[node name="ButtonsContainer" type="VBoxContainer" parent="MainContent/MenuContainer"] +[node name="ButtonsContainer" type="VBoxContainer" parent="MainContent/MenuContainer" index="1"] layout_mode = 2 size_flags_vertical = 6 theme_override_constants/separation = 20 -[node name="ResumeButton" type="Button" parent="MainContent/MenuContainer/ButtonsContainer"] +[node name="ResumeButton" type="Button" parent="MainContent/MenuContainer/ButtonsContainer" index="0"] layout_mode = 2 text = "Resume" -[node name="SavesButton" type="Button" parent="MainContent/MenuContainer/ButtonsContainer"] +[node name="SavesButton" type="Button" parent="MainContent/MenuContainer/ButtonsContainer" index="1"] layout_mode = 2 text = "Saves" -[node name="SettingsButton" type="Button" parent="MainContent/MenuContainer/ButtonsContainer"] +[node name="SettingsButton" type="Button" parent="MainContent/MenuContainer/ButtonsContainer" index="2"] layout_mode = 2 text = "Settings" -[node name="ExitGameButton" type="Button" parent="MainContent/MenuContainer/ButtonsContainer"] +[node name="ExitGameButton" type="Button" parent="MainContent/MenuContainer/ButtonsContainer" index="3"] layout_mode = 2 text = "Exit Game" diff --git a/scenes/ui/pause_menu/pause_menu.tscn b/scenes/ui/pause_menu/pause_menu.tscn index b0626a6..386a57e 100644 --- a/scenes/ui/pause_menu/pause_menu.tscn +++ b/scenes/ui/pause_menu/pause_menu.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=6 format=3 uid="uid://by0gd600mbcr5"] [ext_resource type="Script" uid="uid://domfn2obgmavw" path="res://scenes/ui/pause_menu/pause_menu.gd" id="1_ugqbi"] -[ext_resource type="PackedScene" uid="uid://c36xeip0cq3ov" path="res://scenes/ui/pause_menu/main_menu.tscn" id="2_ugqbi"] -[ext_resource type="PackedScene" uid="uid://11lk8ro2caa4" path="res://scenes/ui/pause_menu/settings_menu.tscn" id="3_8mx0f"] -[ext_resource type="PackedScene" uid="uid://dy3dbe2l3kqdn" path="res://scenes/ui/pause_menu/saves_menu.tscn" id="4_rv5mv"] +[ext_resource type="PackedScene" uid="uid://xy8pdtxcepqf" path="res://scenes/ui/pause_menu/main_menu.tscn" id="2_rv5mv"] +[ext_resource type="PackedScene" uid="uid://uwlutbmfp8dv" path="res://scenes/ui/pause_menu/settings_menu.tscn" id="3_rv5mv"] +[ext_resource type="PackedScene" uid="uid://dq83yv2um7sci" path="res://scenes/ui/pause_menu/saves_menu.tscn" id="4_rv5mv"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_4xojl"] bg_color = Color(0.176419, 0.176419, 0.176419, 0.462745) @@ -18,11 +18,13 @@ grow_vertical = 2 theme_override_styles/panel = SubResource("StyleBoxFlat_4xojl") script = ExtResource("1_ugqbi") -[node name="MainMenu" parent="." instance=ExtResource("2_ugqbi")] +[node name="MainMenu" parent="." instance=ExtResource("2_rv5mv")] layout_mode = 1 -[node name="SettingsMenu" parent="." instance=ExtResource("3_8mx0f")] +[node name="SettingsMenu" parent="." instance=ExtResource("3_rv5mv")] layout_mode = 1 [node name="SavesMenu" parent="." instance=ExtResource("4_rv5mv")] layout_mode = 1 +offset_left = -400.0 +offset_right = 50.0 diff --git a/scenes/ui/pause_menu/saves_menu.tscn b/scenes/ui/pause_menu/saves_menu.tscn index dba228b..f8b3b36 100644 --- a/scenes/ui/pause_menu/saves_menu.tscn +++ b/scenes/ui/pause_menu/saves_menu.tscn @@ -1,178 +1,51 @@ -[gd_scene load_steps=12 format=3 uid="uid://dy3dbe2l3kqdn"] +[gd_scene load_steps=8 format=3 uid="uid://dq83yv2um7sci"] -[ext_resource type="Theme" uid="uid://b5q8b0l6qp1dt" path="res://resources/pause_menu_theme.tres" id="1_4p2cp"] -[ext_resource type="Script" uid="uid://di8dm3fdxfwo1" path="res://scenes/ui/pause_menu/saves_menu.gd" id="1_x1uhs"] -[ext_resource type="PackedScene" uid="uid://cyxieflejsggu" path="res://scenes/ui/pause_menu/saves_manager/save_files_list.tscn" id="2_4p2cp"] -[ext_resource type="PackedScene" uid="uid://bb7poutsn4ex2" path="res://scenes/ui/pause_menu/saves_manager/save_file.tscn" id="3_r04ci"] -[ext_resource type="Texture2D" uid="uid://ja8bc1h5x85o" path="res://assets/ui/save-normal.png" id="4_xldu7"] -[ext_resource type="Texture2D" uid="uid://crqgyft4gfilt" path="res://assets/ui/save-pressed.png" id="5_k6iwt"] -[ext_resource type="Texture2D" uid="uid://o3l0j53mgkan" path="res://assets/ui/save-hover.png" id="6_43e35"] +[ext_resource type="PackedScene" uid="uid://4itp2hjp14n2" path="res://scenes/ui/pause_menu/base_menu.tscn" id="1_i4hg7"] +[ext_resource type="Script" uid="uid://di8dm3fdxfwo1" path="res://scenes/ui/pause_menu/saves_menu.gd" id="2_q3hp2"] +[ext_resource type="PackedScene" uid="uid://cyxieflejsggu" path="res://scenes/ui/pause_menu/saves_manager/save_files_list.tscn" id="3_0ok72"] +[ext_resource type="Texture2D" uid="uid://ja8bc1h5x85o" path="res://assets/ui/save-normal.png" id="3_urnjr"] +[ext_resource type="Texture2D" uid="uid://crqgyft4gfilt" path="res://assets/ui/save-pressed.png" id="4_31dcc"] +[ext_resource type="PackedScene" uid="uid://bb7poutsn4ex2" path="res://scenes/ui/pause_menu/saves_manager/save_file.tscn" id="4_v5wg2"] +[ext_resource type="Texture2D" uid="uid://o3l0j53mgkan" path="res://assets/ui/save-hover.png" id="5_0ok72"] -[sub_resource type="Animation" id="Animation_h2y1u"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector2(-450, 0)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:visible") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [false] -} - -[sub_resource type="Animation" id="Animation_ba5iv"] -resource_name = "hide" -length = 0.2 -step = 0.05 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.2), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [Vector2(0, 0), Vector2(-450, 0)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:visible") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0, 0.2), -"transitions": PackedFloat32Array(1, 1), -"update": 1, -"values": [true, false] -} - -[sub_resource type="Animation" id="Animation_ugqbi"] -resource_name = "show" -length = 0.2 -step = 0.05 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.2), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [Vector2(-450, 0), Vector2(0, 0)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:visible") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [true] -} - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_h2y1u"] -_data = { -&"RESET": SubResource("Animation_h2y1u"), -&"hide": SubResource("Animation_ba5iv"), -&"show": SubResource("Animation_ugqbi") -} - -[node name="SavesMenu" type="ColorRect" node_paths=PackedStringArray("show_save_ui_button", "new_save_ui", "save_name_input", "create_save_button", "create_save_cancel_button", "save_files_list_ui", "animation_player")] -visible = false +[node name="SavesMenu" node_paths=PackedStringArray("show_save_ui_button", "new_save_ui", "save_name_input", "create_save_button", "create_save_cancel_button", "save_files_list_ui") instance=ExtResource("1_i4hg7")] custom_minimum_size = Vector2(450, 0) -anchors_preset = 9 -anchor_bottom = 1.0 offset_left = -450.0 -grow_vertical = 2 -theme = ExtResource("1_4p2cp") -color = Color(0.133333, 0.133333, 0.133333, 0.784314) -script = ExtResource("1_x1uhs") -show_save_ui_button = NodePath("MainContent/MenuContainer/BottomRow/SaveButton") +script = ExtResource("2_q3hp2") +show_save_ui_button = NodePath("BottomRow/SaveButton") new_save_ui = NodePath("NewSaveUI") save_name_input = NodePath("NewSaveUI/MarginContainer/VBoxContainer/SaveNameInput") create_save_button = NodePath("NewSaveUI/MarginContainer/VBoxContainer/SaveButton") create_save_cancel_button = NodePath("NewSaveUI/MarginContainer/VBoxContainer/CancelButton") save_files_list_ui = NodePath("MainContent/MenuContainer/ScrollContainer/SaveFilesList") -animation_player = NodePath("AnimationPlayer") - -[node name="AnimationPlayer" type="AnimationPlayer" parent="."] -libraries = { -&"": SubResource("AnimationLibrary_h2y1u") -} -autoplay = "show" - -[node name="MainContent" type="MarginContainer" parent="."] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -theme_override_constants/margin_left = 20 -theme_override_constants/margin_top = 20 -theme_override_constants/margin_right = 20 -theme_override_constants/margin_bottom = 20 -[node name="MenuContainer" type="VBoxContainer" parent="MainContent"] -layout_mode = 2 - -[node name="Title" type="Label" parent="MainContent/MenuContainer"] -layout_mode = 2 -theme_type_variation = &"MenuTitle" +[node name="Title" parent="MainContent/MenuContainer" index="0"] text = "Save/Load Game" -horizontal_alignment = 1 -[node name="ScrollContainer" type="ScrollContainer" parent="MainContent/MenuContainer"] +[node name="ScrollContainer" type="ScrollContainer" parent="MainContent/MenuContainer" index="1"] custom_minimum_size = Vector2(0, 500) layout_mode = 2 horizontal_scroll_mode = 0 -[node name="SaveFilesList" parent="MainContent/MenuContainer/ScrollContainer" instance=ExtResource("2_4p2cp")] +[node name="SaveFilesList" parent="MainContent/MenuContainer/ScrollContainer" index="0" instance=ExtResource("3_0ok72")] layout_mode = 2 size_flags_horizontal = 6 -[node name="SaveFilePanel" parent="MainContent/MenuContainer/ScrollContainer/SaveFilesList" instance=ExtResource("3_r04ci")] -layout_mode = 2 - -[node name="BottomRow" type="HBoxContainer" parent="MainContent/MenuContainer"] +[node name="SaveFilePanel" parent="MainContent/MenuContainer/ScrollContainer/SaveFilesList" index="0" instance=ExtResource("4_v5wg2")] layout_mode = 2 -alignment = 1 -[node name="SaveButton" type="TextureButton" parent="MainContent/MenuContainer/BottomRow"] +[node name="SaveButton" type="TextureButton" parent="BottomRow" index="0"] clip_contents = true custom_minimum_size = Vector2(32, 32) layout_mode = 2 tooltip_text = "New Save" -texture_normal = ExtResource("4_xldu7") -texture_pressed = ExtResource("5_k6iwt") -texture_hover = ExtResource("6_43e35") +texture_normal = ExtResource("3_urnjr") +texture_pressed = ExtResource("4_31dcc") +texture_hover = ExtResource("5_0ok72") ignore_texture_size = true stretch_mode = 5 -[node name="NewSaveUI" type="Panel" parent="."] +[node name="NewSaveUI" type="Panel" parent="." index="3"] visible = false custom_minimum_size = Vector2(450, 100) layout_mode = 1 @@ -182,7 +55,7 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -[node name="MarginContainer" type="MarginContainer" parent="NewSaveUI"] +[node name="MarginContainer" type="MarginContainer" parent="NewSaveUI" index="0"] layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 @@ -200,25 +73,25 @@ theme_override_constants/margin_top = 5 theme_override_constants/margin_right = 5 theme_override_constants/margin_bottom = 5 -[node name="VBoxContainer" type="VBoxContainer" parent="NewSaveUI/MarginContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="NewSaveUI/MarginContainer" index="0"] layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 -[node name="SaveNameLabel" type="Label" parent="NewSaveUI/MarginContainer/VBoxContainer"] +[node name="SaveNameLabel" type="Label" parent="NewSaveUI/MarginContainer/VBoxContainer" index="0"] layout_mode = 2 theme_override_font_sizes/font_size = 20 text = "Create New Save" -[node name="SaveNameInput" type="LineEdit" parent="NewSaveUI/MarginContainer/VBoxContainer"] +[node name="SaveNameInput" type="LineEdit" parent="NewSaveUI/MarginContainer/VBoxContainer" index="1"] custom_minimum_size = Vector2(400, 0) layout_mode = 2 placeholder_text = "New Save File Name" -[node name="SaveButton" type="Button" parent="NewSaveUI/MarginContainer/VBoxContainer"] +[node name="SaveButton" type="Button" parent="NewSaveUI/MarginContainer/VBoxContainer" index="2"] layout_mode = 2 text = "Create Save" -[node name="CancelButton" type="Button" parent="NewSaveUI/MarginContainer/VBoxContainer"] +[node name="CancelButton" type="Button" parent="NewSaveUI/MarginContainer/VBoxContainer" index="3"] layout_mode = 2 text = "Cancel" diff --git a/scenes/ui/pause_menu/settings_menu.tscn b/scenes/ui/pause_menu/settings_menu.tscn index 2e22529..e962f0a 100644 --- a/scenes/ui/pause_menu/settings_menu.tscn +++ b/scenes/ui/pause_menu/settings_menu.tscn @@ -1,101 +1,9 @@ -[gd_scene load_steps=8 format=3 uid="uid://11lk8ro2caa4"] +[gd_scene load_steps=4 format=3 uid="uid://uwlutbmfp8dv"] [ext_resource type="Script" uid="uid://ccei1q7fb022x" path="res://scenes/ui/pause_menu/settings_menu.gd" id="1_govsn"] -[ext_resource type="Theme" uid="uid://b5q8b0l6qp1dt" path="res://resources/pause_menu_theme.tres" id="2_oec81"] - -[sub_resource type="Animation" id="Animation_vx2qe"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector2(-400, 0)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:visible") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [false] -} - -[sub_resource type="Animation" id="Animation_q12vw"] -resource_name = "hide" -length = 0.2 -step = 0.05 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.2), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [Vector2(0, 0), Vector2(-400, 0)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:visible") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0, 0.2), -"transitions": PackedFloat32Array(1, 1), -"update": 1, -"values": [true, false] -} - -[sub_resource type="Animation" id="Animation_3mo8w"] -resource_name = "show" -length = 0.2 -step = 0.05 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.2), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [Vector2(-400, 0), Vector2(0, 0)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:visible") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [true] -} - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_q12vw"] -_data = { -&"RESET": SubResource("Animation_vx2qe"), -&"hide": SubResource("Animation_q12vw"), -&"show": SubResource("Animation_3mo8w") -} - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ightw"] +[ext_resource type="PackedScene" uid="uid://4itp2hjp14n2" path="res://scenes/ui/pause_menu/base_menu.tscn" id="1_oec81"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_830fb"] content_margin_left = 10.0 content_margin_top = 10.0 content_margin_right = 10.0 @@ -106,163 +14,126 @@ corner_radius_top_right = 2 corner_radius_bottom_right = 2 corner_radius_bottom_left = 2 -[node name="SettingsMenu" type="ColorRect" node_paths=PackedStringArray("autosaves_input", "block_highlight_input", "held_block_ui_input", "quick_slots_ui_input", "screenshot_icon_input", "waila_input", "resolution_input", "fullscreen_input", "vsync_input", "fov_slider", "fov_value_label", "animation_player")] -visible = false -custom_minimum_size = Vector2(400, 0) -anchors_preset = 9 -anchor_bottom = 1.0 -offset_left = -400.0 -grow_vertical = 2 -theme = ExtResource("2_oec81") -color = Color(0.133333, 0.133333, 0.133333, 0.784314) +[node name="SettingsMenu" node_paths=PackedStringArray("autosaves_input", "block_highlight_input", "held_block_ui_input", "quick_slots_ui_input", "screenshot_icon_input", "waila_input", "resolution_input", "fullscreen_input", "vsync_input", "fov_slider", "fov_value_label") instance=ExtResource("1_oec81")] script = ExtResource("1_govsn") -autosaves_input = NodePath("MainContent/VBoxContainer/TabContainer/Game/Autosaves/CheckButton") -block_highlight_input = NodePath("MainContent/VBoxContainer/TabContainer/Game/BlockHighlight/CheckButton") -held_block_ui_input = NodePath("MainContent/VBoxContainer/TabContainer/Game/HeldBlockUI/CheckButton") -quick_slots_ui_input = NodePath("MainContent/VBoxContainer/TabContainer/Game/QuickslotsUI/CheckButton") -screenshot_icon_input = NodePath("MainContent/VBoxContainer/TabContainer/Game/ScreenshotIcon/CheckButton") -waila_input = NodePath("MainContent/VBoxContainer/TabContainer/Game/Waila/CheckButton") -resolution_input = NodePath("MainContent/VBoxContainer/TabContainer/Graphics/Resolution/OptionButton") -fullscreen_input = NodePath("MainContent/VBoxContainer/TabContainer/Graphics/Fullscreen/CheckBox") -vsync_input = NodePath("MainContent/VBoxContainer/TabContainer/Graphics/VSync/CheckBox") -fov_slider = NodePath("MainContent/VBoxContainer/TabContainer/Graphics/FOV/HSlider") -fov_value_label = NodePath("MainContent/VBoxContainer/TabContainer/Graphics/FOV/Value") -animation_player = NodePath("AnimationPlayer") - -[node name="AnimationPlayer" type="AnimationPlayer" parent="."] -libraries = { -&"": SubResource("AnimationLibrary_q12vw") -} -autoplay = "show" - -[node name="MainContent" type="MarginContainer" parent="."] -layout_mode = 1 -anchors_preset = 5 -anchor_left = 0.5 -anchor_right = 0.5 -offset_left = -155.0 -offset_right = 155.0 -offset_bottom = 310.0 -grow_horizontal = 2 -theme_override_constants/margin_left = 10 -theme_override_constants/margin_top = 10 -theme_override_constants/margin_right = 10 -theme_override_constants/margin_bottom = 10 - -[node name="VBoxContainer" type="VBoxContainer" parent="MainContent"] -layout_mode = 2 -size_flags_horizontal = 4 -theme_override_constants/separation = 20 - -[node name="Title" type="Label" parent="MainContent/VBoxContainer"] -layout_mode = 2 -theme_type_variation = &"MenuTitle" +autosaves_input = NodePath("MainContent/MenuContainer/TabContainer/Game/Autosaves/CheckButton") +block_highlight_input = NodePath("MainContent/MenuContainer/TabContainer/Game/BlockHighlight/CheckButton") +held_block_ui_input = NodePath("MainContent/MenuContainer/TabContainer/Game/HeldBlockUI/CheckButton") +quick_slots_ui_input = NodePath("MainContent/MenuContainer/TabContainer/Game/QuickslotsUI/CheckButton") +screenshot_icon_input = NodePath("MainContent/MenuContainer/TabContainer/Game/ScreenshotIcon/CheckButton") +waila_input = NodePath("MainContent/MenuContainer/TabContainer/Game/Waila/CheckButton") +resolution_input = NodePath("MainContent/MenuContainer/TabContainer/Graphics/Resolution/OptionButton") +fullscreen_input = NodePath("MainContent/MenuContainer/TabContainer/Graphics/Fullscreen/CheckBox") +vsync_input = NodePath("MainContent/MenuContainer/TabContainer/Graphics/VSync/CheckBox") +fov_slider = NodePath("MainContent/MenuContainer/TabContainer/Graphics/FOV/HSlider") +fov_value_label = NodePath("MainContent/MenuContainer/TabContainer/Graphics/FOV/Value") + +[node name="Title" parent="MainContent/MenuContainer" index="0"] text = "Settings" -horizontal_alignment = 1 -[node name="TabContainer" type="TabContainer" parent="MainContent/VBoxContainer"] +[node name="TabContainer" type="TabContainer" parent="MainContent/MenuContainer" index="1"] layout_mode = 2 theme_override_constants/side_margin = 0 -theme_override_styles/panel = SubResource("StyleBoxFlat_ightw") +theme_override_styles/panel = SubResource("StyleBoxFlat_830fb") current_tab = 0 clip_tabs = false -[node name="Game" type="VBoxContainer" parent="MainContent/VBoxContainer/TabContainer"] +[node name="Game" type="VBoxContainer" parent="MainContent/MenuContainer/TabContainer" index="1"] layout_mode = 2 metadata/_tab_index = 0 -[node name="BlockHighlight" type="HBoxContainer" parent="MainContent/VBoxContainer/TabContainer/Game"] +[node name="BlockHighlight" type="HBoxContainer" parent="MainContent/MenuContainer/TabContainer/Game" index="0"] layout_mode = 2 -[node name="Label" type="Label" parent="MainContent/VBoxContainer/TabContainer/Game/BlockHighlight"] +[node name="Label" type="Label" parent="MainContent/MenuContainer/TabContainer/Game/BlockHighlight" index="0"] layout_mode = 2 size_flags_horizontal = 3 text = "Enable Block Highlighting" -[node name="CheckButton" type="CheckButton" parent="MainContent/VBoxContainer/TabContainer/Game/BlockHighlight"] +[node name="CheckButton" type="CheckButton" parent="MainContent/MenuContainer/TabContainer/Game/BlockHighlight" index="1"] layout_mode = 2 button_pressed = true -[node name="Waila" type="HBoxContainer" parent="MainContent/VBoxContainer/TabContainer/Game"] +[node name="Waila" type="HBoxContainer" parent="MainContent/MenuContainer/TabContainer/Game" index="1"] layout_mode = 2 -[node name="Label" type="Label" parent="MainContent/VBoxContainer/TabContainer/Game/Waila"] +[node name="Label" type="Label" parent="MainContent/MenuContainer/TabContainer/Game/Waila" index="0"] layout_mode = 2 size_flags_horizontal = 3 text = "Enable Waila" -[node name="CheckButton" type="CheckButton" parent="MainContent/VBoxContainer/TabContainer/Game/Waila"] +[node name="CheckButton" type="CheckButton" parent="MainContent/MenuContainer/TabContainer/Game/Waila" index="1"] layout_mode = 2 button_pressed = true -[node name="QuickslotsUI" type="HBoxContainer" parent="MainContent/VBoxContainer/TabContainer/Game"] +[node name="QuickslotsUI" type="HBoxContainer" parent="MainContent/MenuContainer/TabContainer/Game" index="2"] layout_mode = 2 -[node name="Label" type="Label" parent="MainContent/VBoxContainer/TabContainer/Game/QuickslotsUI"] +[node name="Label" type="Label" parent="MainContent/MenuContainer/TabContainer/Game/QuickslotsUI" index="0"] layout_mode = 2 size_flags_horizontal = 3 text = "Enable Quickslots UI" -[node name="CheckButton" type="CheckButton" parent="MainContent/VBoxContainer/TabContainer/Game/QuickslotsUI"] +[node name="CheckButton" type="CheckButton" parent="MainContent/MenuContainer/TabContainer/Game/QuickslotsUI" index="1"] layout_mode = 2 button_pressed = true -[node name="HeldBlockUI" type="HBoxContainer" parent="MainContent/VBoxContainer/TabContainer/Game"] +[node name="HeldBlockUI" type="HBoxContainer" parent="MainContent/MenuContainer/TabContainer/Game" index="3"] layout_mode = 2 -[node name="Label" type="Label" parent="MainContent/VBoxContainer/TabContainer/Game/HeldBlockUI"] +[node name="Label" type="Label" parent="MainContent/MenuContainer/TabContainer/Game/HeldBlockUI" index="0"] layout_mode = 2 size_flags_horizontal = 3 text = "Enable Player Held Block" -[node name="CheckButton" type="CheckButton" parent="MainContent/VBoxContainer/TabContainer/Game/HeldBlockUI"] +[node name="CheckButton" type="CheckButton" parent="MainContent/MenuContainer/TabContainer/Game/HeldBlockUI" index="1"] layout_mode = 2 button_pressed = true -[node name="ScreenshotIcon" type="HBoxContainer" parent="MainContent/VBoxContainer/TabContainer/Game"] +[node name="ScreenshotIcon" type="HBoxContainer" parent="MainContent/MenuContainer/TabContainer/Game" index="4"] layout_mode = 2 -[node name="Label" type="Label" parent="MainContent/VBoxContainer/TabContainer/Game/ScreenshotIcon"] +[node name="Label" type="Label" parent="MainContent/MenuContainer/TabContainer/Game/ScreenshotIcon" index="0"] layout_mode = 2 size_flags_horizontal = 3 tooltip_text = "Enable/Disable the taking of a screenshot to utilize as the save icon." mouse_filter = 1 text = "Enable Save Screenshot" -[node name="CheckButton" type="CheckButton" parent="MainContent/VBoxContainer/TabContainer/Game/ScreenshotIcon"] +[node name="CheckButton" type="CheckButton" parent="MainContent/MenuContainer/TabContainer/Game/ScreenshotIcon" index="1"] layout_mode = 2 tooltip_text = "Enable/Disable the taking of a screenshot to utilize as the save icon." button_pressed = true -[node name="Autosaves" type="HBoxContainer" parent="MainContent/VBoxContainer/TabContainer/Game"] +[node name="Autosaves" type="HBoxContainer" parent="MainContent/MenuContainer/TabContainer/Game" index="5"] layout_mode = 2 -[node name="Label" type="Label" parent="MainContent/VBoxContainer/TabContainer/Game/Autosaves"] +[node name="Label" type="Label" parent="MainContent/MenuContainer/TabContainer/Game/Autosaves" index="0"] layout_mode = 2 size_flags_horizontal = 3 tooltip_text = "Enable/Disable the taking of a screenshot to utilize as the save icon." mouse_filter = 1 text = "Enable Autosaves" -[node name="CheckButton" type="CheckButton" parent="MainContent/VBoxContainer/TabContainer/Game/Autosaves"] +[node name="CheckButton" type="CheckButton" parent="MainContent/MenuContainer/TabContainer/Game/Autosaves" index="1"] layout_mode = 2 tooltip_text = "Enable/Disable the taking of a screenshot to utilize as the save icon." button_pressed = true -[node name="Graphics" type="VBoxContainer" parent="MainContent/VBoxContainer/TabContainer"] +[node name="Graphics" type="VBoxContainer" parent="MainContent/MenuContainer/TabContainer" index="2"] visible = false layout_mode = 2 metadata/_tab_index = 1 -[node name="Resolution" type="HBoxContainer" parent="MainContent/VBoxContainer/TabContainer/Graphics"] +[node name="Resolution" type="HBoxContainer" parent="MainContent/MenuContainer/TabContainer/Graphics" index="0"] layout_mode = 2 -[node name="Label" type="Label" parent="MainContent/VBoxContainer/TabContainer/Graphics/Resolution"] +[node name="Label" type="Label" parent="MainContent/MenuContainer/TabContainer/Graphics/Resolution" index="0"] layout_mode = 2 size_flags_horizontal = 3 text = "Resolution" -[node name="OptionButton" type="OptionButton" parent="MainContent/VBoxContainer/TabContainer/Graphics/Resolution"] +[node name="OptionButton" type="OptionButton" parent="MainContent/MenuContainer/TabContainer/Graphics/Resolution" index="1"] layout_mode = 2 selected = 0 item_count = 6 @@ -279,37 +150,37 @@ popup/item_4/id = 3 popup/item_5/text = "3840 x 2160" popup/item_5/id = 5 -[node name="Fullscreen" type="HBoxContainer" parent="MainContent/VBoxContainer/TabContainer/Graphics"] +[node name="Fullscreen" type="HBoxContainer" parent="MainContent/MenuContainer/TabContainer/Graphics" index="1"] layout_mode = 2 -[node name="Label" type="Label" parent="MainContent/VBoxContainer/TabContainer/Graphics/Fullscreen"] +[node name="Label" type="Label" parent="MainContent/MenuContainer/TabContainer/Graphics/Fullscreen" index="0"] layout_mode = 2 size_flags_horizontal = 3 text = "Fullscreen" -[node name="CheckBox" type="CheckBox" parent="MainContent/VBoxContainer/TabContainer/Graphics/Fullscreen"] +[node name="CheckBox" type="CheckBox" parent="MainContent/MenuContainer/TabContainer/Graphics/Fullscreen" index="1"] layout_mode = 2 -[node name="VSync" type="HBoxContainer" parent="MainContent/VBoxContainer/TabContainer/Graphics"] +[node name="VSync" type="HBoxContainer" parent="MainContent/MenuContainer/TabContainer/Graphics" index="2"] layout_mode = 2 -[node name="Label" type="Label" parent="MainContent/VBoxContainer/TabContainer/Graphics/VSync"] +[node name="Label" type="Label" parent="MainContent/MenuContainer/TabContainer/Graphics/VSync" index="0"] layout_mode = 2 size_flags_horizontal = 3 text = "VSync" -[node name="CheckBox" type="CheckBox" parent="MainContent/VBoxContainer/TabContainer/Graphics/VSync"] +[node name="CheckBox" type="CheckBox" parent="MainContent/MenuContainer/TabContainer/Graphics/VSync" index="1"] layout_mode = 2 -[node name="FOV" type="HBoxContainer" parent="MainContent/VBoxContainer/TabContainer/Graphics"] +[node name="FOV" type="HBoxContainer" parent="MainContent/MenuContainer/TabContainer/Graphics" index="3"] layout_mode = 2 -[node name="Label" type="Label" parent="MainContent/VBoxContainer/TabContainer/Graphics/FOV"] +[node name="Label" type="Label" parent="MainContent/MenuContainer/TabContainer/Graphics/FOV" index="0"] layout_mode = 2 size_flags_horizontal = 3 text = "FOV" -[node name="HSlider" type="HSlider" parent="MainContent/VBoxContainer/TabContainer/Graphics/FOV"] +[node name="HSlider" type="HSlider" parent="MainContent/MenuContainer/TabContainer/Graphics/FOV" index="1"] layout_mode = 2 size_flags_horizontal = 3 min_value = 60.0 @@ -318,56 +189,42 @@ value = 75.0 rounded = true ticks_on_borders = true -[node name="Value" type="Label" parent="MainContent/VBoxContainer/TabContainer/Graphics/FOV"] +[node name="Value" type="Label" parent="MainContent/MenuContainer/TabContainer/Graphics/FOV" index="2"] layout_mode = 2 text = "75" -[node name="HSeparator" type="HSeparator" parent="MainContent/VBoxContainer/TabContainer/Graphics"] +[node name="HSeparator" type="HSeparator" parent="MainContent/MenuContainer/TabContainer/Graphics" index="4"] layout_mode = 2 theme_override_constants/separation = 20 -[node name="CenterContainer" type="CenterContainer" parent="MainContent/VBoxContainer/TabContainer/Graphics"] +[node name="CenterContainer" type="CenterContainer" parent="MainContent/MenuContainer/TabContainer/Graphics" index="5"] layout_mode = 2 -[node name="ApplyButton" type="Button" parent="MainContent/VBoxContainer/TabContainer/Graphics/CenterContainer"] +[node name="ApplyButton" type="Button" parent="MainContent/MenuContainer/TabContainer/Graphics/CenterContainer" index="0"] layout_mode = 2 text = "Apply/Save" -[node name="Audio" type="VBoxContainer" parent="MainContent/VBoxContainer/TabContainer"] +[node name="Audio" type="VBoxContainer" parent="MainContent/MenuContainer/TabContainer" index="3"] visible = false layout_mode = 2 metadata/_tab_index = 2 -[node name="Inputs" type="VBoxContainer" parent="MainContent/VBoxContainer/TabContainer"] +[node name="Inputs" type="VBoxContainer" parent="MainContent/MenuContainer/TabContainer" index="4"] visible = false layout_mode = 2 metadata/_tab_index = 3 -[node name="BottomRow" type="MarginContainer" parent="."] -layout_mode = 1 -anchors_preset = 7 -anchor_left = 0.5 -anchor_top = 1.0 -anchor_right = 0.5 -anchor_bottom = 1.0 -offset_left = -82.5 -offset_top = -46.0 -offset_right = 82.5 -grow_horizontal = 2 -grow_vertical = 0 -theme_override_constants/margin_bottom = 10 - -[node name="CloseButton" type="Button" parent="BottomRow"] +[node name="CloseButton" type="Button" parent="BottomRow" index="0"] custom_minimum_size = Vector2(141, 36) layout_mode = 2 text = "Close Settings" -[connection signal="toggled" from="MainContent/VBoxContainer/TabContainer/Game/BlockHighlight/CheckButton" to="." method="_on_block_highlighting_toggled"] -[connection signal="toggled" from="MainContent/VBoxContainer/TabContainer/Game/Waila/CheckButton" to="." method="_on_enable_waila_toggled"] -[connection signal="toggled" from="MainContent/VBoxContainer/TabContainer/Game/QuickslotsUI/CheckButton" to="." method="_on_quickslots_ui_toggled"] -[connection signal="toggled" from="MainContent/VBoxContainer/TabContainer/Game/HeldBlockUI/CheckButton" to="." method="_on_held_block_ui_toggled"] -[connection signal="toggled" from="MainContent/VBoxContainer/TabContainer/Game/ScreenshotIcon/CheckButton" to="." method="_on_screenshot_icon_button_toggled"] -[connection signal="toggled" from="MainContent/VBoxContainer/TabContainer/Game/Autosaves/CheckButton" to="." method="_on_autosaves_button_toggled"] -[connection signal="changed" from="MainContent/VBoxContainer/TabContainer/Graphics/FOV/HSlider" to="." method="_on_fov_slider_changed"] -[connection signal="pressed" from="MainContent/VBoxContainer/TabContainer/Graphics/CenterContainer/ApplyButton" to="." method="_on_graphics_apply_button_pressed"] +[connection signal="toggled" from="MainContent/MenuContainer/TabContainer/Game/BlockHighlight/CheckButton" to="." method="_on_block_highlighting_toggled"] +[connection signal="toggled" from="MainContent/MenuContainer/TabContainer/Game/Waila/CheckButton" to="." method="_on_enable_waila_toggled"] +[connection signal="toggled" from="MainContent/MenuContainer/TabContainer/Game/QuickslotsUI/CheckButton" to="." method="_on_quickslots_ui_toggled"] +[connection signal="toggled" from="MainContent/MenuContainer/TabContainer/Game/HeldBlockUI/CheckButton" to="." method="_on_held_block_ui_toggled"] +[connection signal="toggled" from="MainContent/MenuContainer/TabContainer/Game/ScreenshotIcon/CheckButton" to="." method="_on_screenshot_icon_button_toggled"] +[connection signal="toggled" from="MainContent/MenuContainer/TabContainer/Game/Autosaves/CheckButton" to="." method="_on_autosaves_button_toggled"] +[connection signal="value_changed" from="MainContent/MenuContainer/TabContainer/Graphics/FOV/HSlider" to="." method="_on_fov_slider_changed"] +[connection signal="pressed" from="MainContent/MenuContainer/TabContainer/Graphics/CenterContainer/ApplyButton" to="." method="_on_graphics_apply_button_pressed"] [connection signal="pressed" from="BottomRow/CloseButton" to="." method="_on_close_button_pressed"]