maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-01 11:15:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Debug menu fix

Browse source
This commit is contained in:
Marco 2025-02-19 15:45:21 +01:00
commit fe01ac4ef1
9 changed files with 242 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Scripts/GameManager.cs
View file

@ -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);

94
Scripts/Hud.cs
View file

@ -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<string, HudItem> _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<PauseMenu>();
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<DebugMenu>();
DebugMenuHolder.CallDeferred("add_child", menu);
menu.DebugMenuClosed += () =>
{
DebugMenuHolder.Visible = false;
SpawnPauseMenu();
};
}
public class HudItem
{
public LootItem Item { get; set; }

39
Scripts/MainMenu.cs
View file

@ -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<DebugMenu>();
DebugMenuHolder.CallDeferred("add_child", menu);
menu.DebugMenuClosed += () =>
{
DebugMenuHolder.Visible = false;
};
child.QueueFree();
}
var menu = DebugMenuTemplate.Instantiate<DebugMenu>();
DebugMenuHolder.CallDeferred("add_child", menu);
menu.DebugMenuClosed += () =>
{
DebugMenuHolder.Visible = false;
};
}
private void _on_mainmenu_button_pressed()

10
Scripts/UI/DebugMenu.cs
View file

@ -9,7 +9,7 @@ public partial class DebugMenu : Control
public Theme ButtonTheme { get; private set; }
[Export]
public Array<PackedScene> Levels { get; private set; }
public Array<string> 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()

52
Scripts/UI/PauseMenu.cs Normal file
View file

@ -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<GameManager>("/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);
}
}