diff --git a/Scenes/HUD/HUD.tscn b/Scenes/HUD/HUD.tscn index 46101754..5466584d 100644 --- a/Scenes/HUD/HUD.tscn +++ b/Scenes/HUD/HUD.tscn @@ -1,9 +1,11 @@ -[gd_scene load_steps=13 format=3 uid="uid://dkwi1hu1bixoe"] +[gd_scene load_steps=15 format=3 uid="uid://dkwi1hu1bixoe"] [ext_resource type="Script" path="res://Scripts/Hud.cs" id="1_m0hb0"] [ext_resource type="FontFile" uid="uid://ccm3u37q1hvux" path="res://fonts/Xolonium-Regular.ttf" id="2_0xmx2"] [ext_resource type="LabelSettings" uid="uid://buk3e7bbwmnv1" path="res://Resources/Styles/Hud_Text_Style.tres" id="2_x7kl7"] [ext_resource type="Texture2D" uid="uid://dde36pgb8fbwc" path="res://Sprites/selector_big.png" id="3_hee3i"] +[ext_resource type="PackedScene" uid="uid://bybd38ivpb2ly" path="res://Scenes/HUD/pause_menu.tscn" id="3_hxmxt"] +[ext_resource type="PackedScene" uid="uid://bemu3l6b1e84y" path="res://Scenes/HUD/debug_menu.tscn" id="4_gd1k6"] [ext_resource type="PackedScene" uid="uid://bwlstkdibs7oc" path="res://Scenes/HUD/BossHud.tscn" id="5_vmict"] [sub_resource type="AtlasTexture" id="AtlasTexture_h626b"] @@ -46,7 +48,7 @@ anti_aliasing = false bg_color = Color(0.338981, 0.507716, 0.996646, 1) anti_aliasing = false -[node name="HUD" type="CanvasLayer" node_paths=PackedStringArray("_healthLabel", "_healthBar", "_shieldLabel", "_shieldBar", "_itemsContainer")] +[node name="HUD" type="CanvasLayer" node_paths=PackedStringArray("_healthLabel", "_healthBar", "_shieldLabel", "_shieldBar", "_itemsContainer", "PauseMenuContainer", "DebugMenuHolder")] script = ExtResource("1_m0hb0") _healthLabel = NodePath("VBoxContainer/HealthBarContainer/HealthLabel") _healthBar = NodePath("VBoxContainer/HealthBarContainer/HealthBar") @@ -54,6 +56,10 @@ _shieldLabel = NodePath("VBoxContainer/ShieldBarContainer/ShieldLabel") _shieldBar = NodePath("VBoxContainer/ShieldBarContainer/ShieldBar") _itemsContainer = NodePath("VBoxContainer/ItemsContainer") _labelSettings = ExtResource("2_x7kl7") +PauseMenuContainer = NodePath("PauseMenuContainer") +PauseMenuScene = ExtResource("3_hxmxt") +DebugMenuTemplate = ExtResource("4_gd1k6") +DebugMenuHolder = NodePath("DebugContainer") [node name="GameOver" type="Label" parent="."] visible = false @@ -137,3 +143,17 @@ theme_override_constants/separation = 0 [node name="BossHud" parent="." instance=ExtResource("5_vmict")] visible = false + +[node name="DebugContainer" type="PanelContainer" parent="."] +visible = false +offset_left = 66.0 +offset_top = 45.0 +offset_right = 259.0 +offset_bottom = 156.0 + +[node name="PauseMenuContainer" type="PanelContainer" parent="."] +visible = false +offset_left = 106.0 +offset_top = 26.0 +offset_right = 226.0 +offset_bottom = 144.0 diff --git a/Scenes/HUD/debug_menu.tscn b/Scenes/HUD/debug_menu.tscn index 9b8008a6..bf8c9ca1 100644 --- a/Scenes/HUD/debug_menu.tscn +++ b/Scenes/HUD/debug_menu.tscn @@ -1,11 +1,7 @@ -[gd_scene load_steps=7 format=3 uid="uid://bemu3l6b1e84y"] +[gd_scene load_steps=3 format=3 uid="uid://bemu3l6b1e84y"] [ext_resource type="Script" path="res://Scripts/UI/DebugMenu.cs" id="1_5vtnj"] [ext_resource type="Theme" uid="uid://dnsadvmunm76k" path="res://Resources/Styles/MainMenuButtons.tres" id="2_wqb8e"] -[ext_resource type="PackedScene" uid="uid://bv451a8wgty4u" path="res://Scenes/test.tscn" id="3_nd4do"] -[ext_resource type="PackedScene" uid="uid://c4yvclwjr2g3s" path="res://Scenes/naviogation_test.tscn" id="4_sxmbn"] -[ext_resource type="PackedScene" uid="uid://bu5fvatj2j08j" path="res://Scenes/Maps/BossTestArena.tscn" id="5_jms4h"] -[ext_resource type="PackedScene" uid="uid://bx31ou6tw3kd1" path="res://Scenes/Maps/RebelBase.tscn" id="6_4c6m4"] [node name="DebugMenu" type="VBoxContainer" node_paths=PackedStringArray("ButtonsContainer")] anchors_preset = 15 @@ -15,7 +11,7 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_5vtnj") ButtonTheme = ExtResource("2_wqb8e") -Levels = Array[PackedScene]([ExtResource("3_nd4do"), ExtResource("4_sxmbn"), ExtResource("5_jms4h"), ExtResource("6_4c6m4")]) +Levels = Array[String](["res://Scenes/test.tscn", "res://Scenes/naviogation_test.tscn", "res://Scenes/Actors/ActorEnemyTest.tscn", "res://Scenes/Maps/BossTestArena.tscn", "res://Scenes/Maps/RebelBase.tscn"]) ButtonsContainer = NodePath("Level Select") [node name="HBoxContainer" type="HBoxContainer" parent="."] diff --git a/Scenes/HUD/pause_menu.tscn b/Scenes/HUD/pause_menu.tscn new file mode 100644 index 00000000..abdd1f7d --- /dev/null +++ b/Scenes/HUD/pause_menu.tscn @@ -0,0 +1,42 @@ +[gd_scene load_steps=5 format=3 uid="uid://bybd38ivpb2ly"] + +[ext_resource type="Script" path="res://Scripts/UI/PauseMenu.cs" id="1_ntuto"] +[ext_resource type="FontFile" uid="uid://ccm3u37q1hvux" path="res://fonts/Xolonium-Regular.ttf" id="2_kog7o"] +[ext_resource type="Theme" uid="uid://dnsadvmunm76k" path="res://Resources/Styles/MainMenuButtons.tres" id="3_3pd7q"] + +[sub_resource type="LabelSettings" id="LabelSettings_f8f0c"] +font = ExtResource("2_kog7o") + +[node name="PauseMenu" type="VBoxContainer" node_paths=PackedStringArray("ResumeButton", "QuitButton", "OptionsButton", "DebugButton")] +script = ExtResource("1_ntuto") +MainMenuScene = "res://Scenes/MainMenu.tscn" +ResumeButton = NodePath("ResumeButton") +QuitButton = NodePath("Main Menu") +OptionsButton = NodePath("Options") +DebugButton = NodePath("Debug") + +[node name="Label" type="Label" parent="."] +layout_mode = 2 +text = "Paused" +label_settings = SubResource("LabelSettings_f8f0c") +horizontal_alignment = 1 + +[node name="ResumeButton" type="Button" parent="."] +layout_mode = 2 +theme = ExtResource("3_3pd7q") +text = "Resume" + +[node name="Options" type="Button" parent="."] +layout_mode = 2 +theme = ExtResource("3_3pd7q") +text = "Options" + +[node name="Debug" type="Button" parent="."] +layout_mode = 2 +theme = ExtResource("3_3pd7q") +text = "Debug" + +[node name="Main Menu" type="Button" parent="."] +layout_mode = 2 +theme = ExtResource("3_3pd7q") +text = "Main Menu" diff --git a/Scenes/MainMenu.tscn b/Scenes/MainMenu.tscn index a3252574..0bd96fdb 100644 --- a/Scenes/MainMenu.tscn +++ b/Scenes/MainMenu.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=13 format=3 uid="uid://5xajclchk3my"] +[gd_scene load_steps=12 format=3 uid="uid://5xajclchk3my"] [ext_resource type="Script" path="res://Scripts/MainMenu.cs" id="1_702nk"] -[ext_resource type="PackedScene" uid="uid://bv451a8wgty4u" path="res://Scenes/test.tscn" id="2_6rjfu"] [ext_resource type="Texture2D" uid="uid://xvadkvwajs0t" path="res://Sprites/UI/Crystal.png" id="2_j4e6a"] [ext_resource type="Texture2D" uid="uid://dicat7qqa0a7o" path="res://Sprites/Portraits/CirnoTitle.png" id="2_mpelb"] [ext_resource type="Texture2D" uid="uid://by38ufb51f6rx" path="res://Sprites/UI/TitleBackground.png" id="2_qdx0s"] @@ -38,7 +37,7 @@ offset_bottom = -2.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_702nk") -GameScene = ExtResource("2_6rjfu") +GameScene = "res://Scenes/test.tscn" MainMenuScene = "res://Scenes/MainMenu.tscn" DebugMenuTemplate = ExtResource("9_nwlsr") DebugMenuHolder = NodePath("Panel") diff --git a/Scripts/GameManager.cs b/Scripts/GameManager.cs index 3b875d75..6c6893a6 100644 --- a/Scripts/GameManager.cs +++ b/Scripts/GameManager.cs @@ -58,6 +58,11 @@ public partial class GameManager : Node2D SpawnBulletsContainer(); + if (_hud != null) + { + this.GameStateChange += _hud.OnGameStateChanged; + } + if (_inventoryManager != null && _hud != null) { _inventoryManager.ItemAdded += (item, currentAmount) => _hud.AddInventoryItem(item, currentAmount); diff --git a/Scripts/Hud.cs b/Scripts/Hud.cs index 956d945c..7172b5b5 100644 --- a/Scripts/Hud.cs +++ b/Scripts/Hud.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using Cirno.Scripts; using Cirno.Scripts.Resources; +using Cirno.Scripts.UI; public partial class Hud : CanvasLayer { @@ -28,8 +29,23 @@ public partial class Hud : CanvasLayer [Export] private LabelSettings _labelSettings; + [ExportGroup("Pause Menu")] [Export] + public Control PauseMenuContainer; + [ExportGroup("Pause Menu")] [Export] + public PackedScene PauseMenuScene; + + [ExportGroup("Debug Menu")] + [Export] + public PackedScene DebugMenuTemplate { get; set; } + + [ExportGroup("Debug Menu")] + [Export] + public Control DebugMenuHolder { get; set; } + private Dictionary _items = new(); + private PauseMenu _pauseMenu; + public override void _Ready() { // Assuming the HUD has a Label node named "HealthLabel" @@ -157,6 +173,60 @@ public partial class Hud : CanvasLayer // _itemsContainer.AddChild(texture); } + public void OnGameStateChanged(GameState state) + { + // Clear on every change + ClearPauseMenu(); + + switch (state) + { + case GameState.Menu: + break; + case GameState.Paused: + SpawnPauseMenu(); + break; + case GameState.Playing: + ClearPauseMenu(); + break; + case GameState.Dialogue: + ClearPauseMenu(); + break; + default: + throw new ArgumentOutOfRangeException(nameof(state), state, null); + } + } + + private void SpawnPauseMenu() + { + if (PauseMenuContainer is null || PauseMenuScene is null) return; + + PauseMenuContainer.Visible = true; + + _pauseMenu = PauseMenuScene.Instantiate(); + + PauseMenuContainer.CallDeferred("add_child", _pauseMenu); + + _pauseMenu.SpawnDebugMenu += SpawnDebugMenu; + } + + private void ClearPauseMenu() + { + if (PauseMenuContainer is null) return; + + if (_pauseMenu is not null) + { + _pauseMenu.SpawnDebugMenu -= SpawnDebugMenu; + } + + PauseMenuContainer.Visible = false; + + var children = PauseMenuContainer.GetChildren(); + foreach (var child in children) + { + child.QueueFree(); + } + } + public void RemoveInventoryItem(string itemKey, int currentAmount) { if (_items.TryGetValue(itemKey, out var itm)) @@ -190,6 +260,30 @@ public partial class Hud : CanvasLayer } + private void SpawnDebugMenu() + { + ClearPauseMenu(); + + if (DebugMenuTemplate is null || DebugMenuHolder is null) return; + DebugMenuHolder.Visible = true; + + var children = DebugMenuHolder.GetChildren(); + foreach (var child in children) + { + child.QueueFree(); + } + + var menu = DebugMenuTemplate.Instantiate(); + + DebugMenuHolder.CallDeferred("add_child", menu); + + menu.DebugMenuClosed += () => + { + DebugMenuHolder.Visible = false; + SpawnPauseMenu(); + }; + } + public class HudItem { public LootItem Item { get; set; } diff --git a/Scripts/MainMenu.cs b/Scripts/MainMenu.cs index f76c2492..52b98259 100644 --- a/Scripts/MainMenu.cs +++ b/Scripts/MainMenu.cs @@ -5,14 +5,16 @@ public partial class MainMenu : Control { [Export] - public PackedScene GameScene { get; set; } + public string GameScene { get; set; } [Export] public string MainMenuScene { get; set; } + [ExportGroup("Debug Menu")] [Export] public PackedScene DebugMenuTemplate { get; set; } + [ExportGroup("Debug Menu")] [Export] public Control DebugMenuHolder { get; set; } @@ -29,32 +31,29 @@ public partial class MainMenu : Control private void _on_start_button_pressed() { if (GameScene != null) { - GetTree().ChangeSceneToFile(GameScene.ResourcePath); + GetTree().ChangeSceneToFile(GameScene); } } private void _on_debug_button_pressed() { - if (DebugMenuTemplate is not null && DebugMenuHolder is not null) + if (DebugMenuTemplate is null || DebugMenuHolder is null) return; + DebugMenuHolder.Visible = true; + + var children = DebugMenuHolder.GetChildren(); + foreach (var child in children) { - DebugMenuHolder.Visible = true; - - var children = DebugMenuHolder.GetChildren(); - foreach (var child in children) - { - child.QueueFree(); - } - - var menu = DebugMenuTemplate.Instantiate(); - - DebugMenuHolder.CallDeferred("add_child", menu); - - menu.DebugMenuClosed += () => - { - DebugMenuHolder.Visible = false; - }; - + child.QueueFree(); } + + var menu = DebugMenuTemplate.Instantiate(); + + DebugMenuHolder.CallDeferred("add_child", menu); + + menu.DebugMenuClosed += () => + { + DebugMenuHolder.Visible = false; + }; } private void _on_mainmenu_button_pressed() diff --git a/Scripts/UI/DebugMenu.cs b/Scripts/UI/DebugMenu.cs index 32c81c01..06471b78 100644 --- a/Scripts/UI/DebugMenu.cs +++ b/Scripts/UI/DebugMenu.cs @@ -9,7 +9,7 @@ public partial class DebugMenu : Control public Theme ButtonTheme { get; private set; } [Export] - public Array Levels { get; private set; } + public Array Levels { get; set; } [Export] public Container ButtonsContainer { get; private set; } @@ -23,7 +23,8 @@ public partial class DebugMenu : Control foreach (var level in Levels) { var button = new Button(); - button.Text = level.ResourcePath.Split("/")[^1].Split(".")[0]; + button.Text = level.Split("/")[^1].Split(".")[0]; + //button.Text = level; button.Theme = ButtonTheme; ButtonsContainer.CallDeferred("add_child", button); @@ -33,10 +34,11 @@ public partial class DebugMenu : Control } } - private void ButtonOnPressed(PackedScene scene) + private void ButtonOnPressed(string scene) { GD.Print("Button was pressed, now what"); - GetTree().ChangeSceneToFile(scene.ResourcePath); + GetTree().ChangeSceneToFile(scene); + } private void _on_back_button_pressed() diff --git a/Scripts/UI/PauseMenu.cs b/Scripts/UI/PauseMenu.cs new file mode 100644 index 00000000..02dedb0e --- /dev/null +++ b/Scripts/UI/PauseMenu.cs @@ -0,0 +1,52 @@ +using Godot; + +namespace Cirno.Scripts.UI; + +public partial class PauseMenu : Control +{ + [ExportGroup("Scenes")] + [Export] + public string MainMenuScene { get; private set; } + + [ExportGroup("Buttons")] + [Export] + public Button ResumeButton { get; private set; } + [ExportGroup("Buttons")] + [Export] + public Button QuitButton { get; private set; } + [ExportGroup("Buttons")] + [Export] + public Button OptionsButton { get; private set; } + [ExportGroup("Buttons")] + [Export] + public Button DebugButton { get; private set; } + + private GameManager _gameManager; + + [Signal] + public delegate void SpawnDebugMenuEventHandler(); + + public override void _Ready() + { + _gameManager = GetNode("/root/GameScene"); + + ResumeButton.Pressed += ResumeButtonOnPressed; + QuitButton.Pressed += QuitButtonOnPressed; + DebugButton.Pressed += DebugButtonOnPressed; + } + + private void DebugButtonOnPressed() + { + EmitSignal(SignalName.SpawnDebugMenu); + } + + private void ResumeButtonOnPressed() + { + _gameManager.Unpause(); + } + + private void QuitButtonOnPressed() + { + GetTree().ChangeSceneToFile(MainMenuScene); + } +} \ No newline at end of file