From a4d47d7f0018907d2bc043d38102fee7b2afa17e Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Fri, 12 Jun 2026 08:40:11 -0500 Subject: [PATCH] Add main menu to pause menu --- ui/pause/PauseMain.gd | 3 +++ ui/pause/PauseMain.tscn | 7 ++++++- ui/pause/PauseMenu.gd | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ui/pause/PauseMain.gd b/ui/pause/PauseMain.gd index 281b387..0e8b666 100644 --- a/ui/pause/PauseMain.gd +++ b/ui/pause/PauseMain.gd @@ -2,10 +2,12 @@ class_name PauseMain extends VBoxContainer signal resumeRequested signal settingsRequested +signal mainMenuRequested signal quitRequested @export var btnResume:Button @export var btnSettings:Button +@export var btnMainMenu:Button @export var btnQuit:Button @export var mainButtons:VBoxContainer @export var confirmQuit:VBoxContainer @@ -16,6 +18,7 @@ func _ready() -> void: visible = false btnResume.pressed.connect(resumeRequested.emit) btnSettings.pressed.connect(settingsRequested.emit) + btnMainMenu.pressed.connect(mainMenuRequested.emit) btnQuit.pressed.connect(_showConfirm) btnQuitConfirm.pressed.connect(quitRequested.emit) btnQuitCancel.pressed.connect(cancelConfirm) diff --git a/ui/pause/PauseMain.tscn b/ui/pause/PauseMain.tscn index fb04e74..9ec3e8b 100644 --- a/ui/pause/PauseMain.tscn +++ b/ui/pause/PauseMain.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://c7kvg0jw6w340" path="res://ui/pause/PauseMain.gd" id="1_b5xfl"] -[node name="PauseMain" type="VBoxContainer" node_paths=PackedStringArray("btnResume", "btnSettings", "btnQuit", "mainButtons", "confirmQuit", "btnQuitConfirm", "btnQuitCancel")] +[node name="PauseMain" type="VBoxContainer" node_paths=PackedStringArray("btnResume", "btnSettings", "btnMainMenu", "btnQuit", "mainButtons", "confirmQuit", "btnQuitConfirm", "btnQuitCancel")] anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -14,6 +14,7 @@ script = ExtResource("1_b5xfl") metadata/_custom_type_script = "uid://c7kvg0jw6w340" btnResume = NodePath("MainButtons/Resume") btnSettings = NodePath("MainButtons/Settings") +btnMainMenu = NodePath("MainButtons/MainMenu") btnQuit = NodePath("MainButtons/Quit") mainButtons = NodePath("MainButtons") confirmQuit = NodePath("ConfirmQuit") @@ -36,6 +37,10 @@ text = "Resume" layout_mode = 2 text = "Settings" +[node name="MainMenu" type="Button" parent="MainButtons"] +layout_mode = 2 +text = "Main Menu" + [node name="Quit" type="Button" parent="MainButtons"] layout_mode = 2 text = "Quit Game" diff --git a/ui/pause/PauseMenu.gd b/ui/pause/PauseMenu.gd index 3dc70ed..329a123 100644 --- a/ui/pause/PauseMenu.gd +++ b/ui/pause/PauseMenu.gd @@ -7,6 +7,7 @@ func _ready() -> void: close() MAIN.resumeRequested.connect(close) MAIN.settingsRequested.connect(_openSettings) + MAIN.mainMenuRequested.connect(_goToMainMenu) MAIN.quitRequested.connect(func(): get_tree().quit()) func isOpen() -> bool: @@ -27,6 +28,10 @@ func _openSettings() -> void: MAIN.close() settingsPanel.open() +func _goToMainMenu() -> void: + close() + SCENE.setScene(SceneSingleton.SceneType.INITIAL) + func _unhandled_input(event:InputEvent) -> void: if !visible: return