maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-12 08:05:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Separated ammo and notifications from hud

Browse source
This commit is contained in:
Marco 2025-05-15 20:29:02 +02:00
commit 46c433e5f7
39 changed files with 258 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Scripts/Hud.cs
View file

@ -5,6 +5,7 @@ using System.Linq;
using Cirno.Scripts;
using Cirno.Scripts.Resources;
using Cirno.Scripts.UI;
using Cirno.Scripts.Utils;
public partial class Hud : CanvasLayer
{
@ -44,7 +45,10 @@ public partial class Hud : CanvasLayer
[Export] private Container _fairyTerminatedPanel;
[Export] private Container _hudInfoPanel;
[Export] public Container NotificationsContainer { get; private set; }
[Export] public Container WeaponContainer { get; private set; }
[ExportGroup("Pause Menu")] [Export]
public Control PauseMenuContainer;
[ExportGroup("Pause Menu")] [Export]
@ -57,12 +61,16 @@ public partial class Hud : CanvasLayer
[ExportGroup("Debug Menu")]
[Export]
public Control DebugMenuHolder { get; set; }
private Dictionary<string, WeaponAmmoCounter> _items = new();
private PauseMenu _pauseMenu;
private bool _playerDead = false; // useless
private WeaponAmmoCounter _weapon;
public override void _Ready()
{
@ -78,9 +86,20 @@ public partial class Hud : CanvasLayer
{
var instance = ItemNotificationTemplate.Instantiate<ItemNotification>();
_itemsContainer.CallDeferred("add_child", instance);
NotificationsContainer.CallDeferred("add_child", instance);
instance.Init(item, currentamount, ItemsNotificationTimeout);
if (item.UiType.HasAnyFlag(UiItemType.Ammo | UiItemType.Energy))
{
AddWeapon(item);
return;
}
if (item.UiType.HasAnyFlag(UiItemType.Icon | UiItemType.Count))
{
AddInventoryItem(item, currentamount);
}
}
public void ShowMessage(string text)
@ -165,9 +184,22 @@ public partial class Hud : CanvasLayer
//_selector.Position = _selector.tolo
}
private void AddWeapon(LootItem item)
{
_weapon?.Delete();
var instance = WeaponContainerTemplate.Instantiate<WeaponAmmoCounter>();
WeaponContainer.CallDeferred("add_child", instance);
instance.Init(item);
_weapon = instance;
}
public void AddInventoryItem(LootItem item, int currentAmount)
{
if (item.UiType == UiItemType.NoUI) return;
if (item.UiType == 0) return;
if (!_items.TryGetValue(item.ItemKey, out var item1))
{
@ -355,13 +387,14 @@ public partial class Hud : CanvasLayer
}
// Clear all items
foreach (var hudItem in _items)
{
hudItem.Value.Delete();
}
_items.Clear();
// foreach (var hudItem in _items)
// {
// hudItem.Value.Delete();
// }
// _items.Clear();
AddInventoryItem(item.Item, item.Count);
AddWeapon(item.Item);
//AddInventoryItem(item.Item, item.Count);
}