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

Made gamemanager resilient to not having components

Browse source
This commit is contained in:
Marco 2025-02-05 13:38:36 +01:00
commit 9c8ec486fc
2 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Scenes/Maps/BossTestArena.tscn Normal file
View file

@ -0,0 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://bu5fvatj2j08j"]
[ext_resource type="Script" path="res://Scripts/GameManager.cs" id="1_paetl"]
[node name="BossTestArena" type="Node2D"]
script = ExtResource("1_paetl")

50
Scripts/GameManager.cs
View file

@ -30,10 +30,14 @@ public partial class GameManager : Node2D
// Called when the node enters the scene tree for the first time. // Called when the node enters the scene tree for the first time.
public override void _Ready() public override void _Ready()
{ {
_hud = GetNode<Hud>("HUD"); _hud = GetNodeOrNull<Hud>("HUD");
_cameraTarget = GetNode<Node2D>("CameraTarget"); if (_hud == null) GD.Print("No HUD in scene.");
_inventoryManager = GetNode<InventoryManager>("InventoryManager"); _cameraTarget = GetNodeOrNull<Node2D>("CameraTarget");
if (_cameraTarget == null) GD.Print("No camera target in scene.");
_inventoryManager = GetNodeOrNull<InventoryManager>("InventoryManager");
if (_inventoryManager == null) GD.Print("No inventory manager in scene.");
//_alarmManager = GetNode<AlarmManager>("AlarmManager"); //_alarmManager = GetNode<AlarmManager>("AlarmManager");
@ -44,15 +48,18 @@ public partial class GameManager : Node2D
SpawnPlayer(); SpawnPlayer();
} }
_player.HealthChanged += (newHealth, maxHealth) => _hud.UpdateHealth(newHealth, maxHealth); if (_inventoryManager != null && _hud != null)
{
_player.InteractableAreaEntered += (interactable) => _hud.UpdateInteractable(interactable); _inventoryManager.ItemAdded += (item) => _hud.AddInventoryItem(item);
_inventoryManager.ItemRemoved += (item) => _hud.RemoveInventoryItem(item);
_inventoryManager.ItemAdded += (item) => _hud.AddInventoryItem(item); }
_inventoryManager.ItemRemoved += (item) => _hud.RemoveInventoryItem(item);
if (_player != null && _hud != null)
//_player.Connect(nameof(_player.HealthChanged), _hud, nameof(_hud.UpdateHealth)); {
_player.HealthChanged += (newHealth, maxHealth) => _hud.UpdateHealth(newHealth, maxHealth);
_player.InteractableAreaEntered += (interactable) => _hud.UpdateInteractable(interactable);
}
} }
// Called every frame. 'delta' is the elapsed time since the previous frame. // Called every frame. 'delta' is the elapsed time since the previous frame.
@ -62,16 +69,17 @@ public partial class GameManager : Node2D
public void SpawnPlayer() public void SpawnPlayer()
{ {
if (_player == null) if (_player != null) return;
//_player = this.CreateChild<PlayerMovement>(PlayerTemplate, PlayerSpawnMarker.Position );
_player = PlayerTemplate.Instantiate<PlayerMovement>();
this.CallDeferred("add_child", _player);
_player.Transform = this.GlobalTransform;
_player.GlobalPosition = PlayerSpawnMarker.Position;
if (_cameraTarget != null)
{ {
//_player = this.CreateChild<PlayerMovement>(PlayerTemplate, PlayerSpawnMarker.Position );
_player = PlayerTemplate.Instantiate<PlayerMovement>();
this.CallDeferred("add_child", _player);
_player.Transform = this.GlobalTransform;
_player.GlobalPosition = PlayerSpawnMarker.Position;
_cameraTarget.Reparent(_player, true); _cameraTarget.Reparent(_player, true);
_cameraTarget.GlobalPosition = _player.Position; _cameraTarget.GlobalPosition = _player.Position;
} }