GKaszewski/przygody-pana-cegly
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: enhance GameStateStore integration and improve skill management

Browse Source
This commit is contained in:
Gabriel Kaszewski
2026-03-19 02:33:07 +01:00
parent 3e36e48e97
commit eeefca4d4e
31 changed files with 260 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/Events/GhostEventHandler.cs
View File

@@ -15,8 +15,11 @@ public partial class GhostEventHandler : Node
public override void _ExitTree()
{
EventBus.Instance.LevelStarted -= OnLevelStarted;
EventBus.Instance.LevelCompleted -= OnLevelCompleted;
if (EventBus.Instance != null)
{
EventBus.Instance.LevelStarted -= OnLevelStarted;
EventBus.Instance.LevelCompleted -= OnLevelCompleted;
}
}
private void OnLevelStarted(int levelIndex, Node currentScene)

29
scripts/Events/LevelStateHandler.cs
View File

@@ -1,29 +0,0 @@
using Godot;
using Mr.BrickAdventures.Autoloads;
namespace Mr.BrickAdventures.scripts.Events;
/// <summary>
/// Handles level completion events and updates GameStateStore.
/// </summary>
public partial class LevelStateHandler : Node
{
public override void _Ready()
{
EventBus.Instance.LevelCompleted += OnLevelCompleted;
}
public override void _ExitTree()
{
if (EventBus.Instance != null)
{
EventBus.Instance.LevelCompleted -= OnLevelCompleted;
}
}
private void OnLevelCompleted(int levelIndex, Node currentScene, double completionTime)
{
// State mutations (commit coins/skills, reset session) are handled by GameManager.OnLevelComplete
// before this event fires. This handler is reserved for future level-specific side-effects.
}
}

1
scripts/Events/LevelStateHandler.cs.uid
View File

@@ -1 +0,0 @@
uid://gx5vn7viphv

1
scripts/Events/SkillCollectHandler.cs
View File

@@ -33,7 +33,6 @@ public partial class SkillCollectHandler : Node
GameStateStore.Instance?.UnlockSkillInSession(skill);
// Immediately activate the skill for the player
skill.Level = 1;
SkillManager?.AddSkill(skill);
// Emit skill unlocked event for UI/achievements

3
scripts/Events/SpeedRunEventHandler.cs
View File

@@ -13,7 +13,8 @@ public partial class SpeedRunEventHandler : Node
public override void _ExitTree()
{
EventBus.Instance.LevelCompleted -= OnLevelCompleted;
if (EventBus.Instance != null)
EventBus.Instance.LevelCompleted -= OnLevelCompleted;
}
private void OnLevelCompleted(int levelIndex, Node currentScene, double completionTime)

25
scripts/Events/StatisticsEventHandler.cs
View File

@@ -1,19 +1,16 @@
using Godot;
using Mr.BrickAdventures.Autoloads;
using Mr.BrickAdventures.scripts.State;
namespace Mr.BrickAdventures.scripts.Events;
/// <summary>
/// Handles game events and updates statistics accordingly.
/// Listens to EventBus signals and increments relevant stats.
/// </summary>
public partial class StatisticsEventHandler : Node
{
private StatisticsManager StatisticsManager => StatisticsManager.Instance;
public override void _Ready()
{
// Subscribe to events
EventBus.Instance.CoinCollected += OnCoinCollected;
EventBus.Instance.EnemyDefeated += OnEnemyDefeated;
EventBus.Instance.PlayerDied += OnPlayerDied;
@@ -33,27 +30,17 @@ public partial class StatisticsEventHandler : Node
}
private void OnCoinCollected(int amount, Vector2 position)
{
StatisticsManager.IncrementStat("coins_collected", amount);
}
=> GameStateStore.Instance?.IncrementStat(StatNames.CoinsCollected, amount);
private void OnEnemyDefeated(Node enemy, Vector2 position)
{
StatisticsManager.IncrementStat("enemies_defeated");
}
=> GameStateStore.Instance?.IncrementStat(StatNames.EnemiesDefeated);
private void OnPlayerDied(Vector2 position)
{
StatisticsManager.IncrementStat("deaths");
}
=> GameStateStore.Instance?.IncrementStat(StatNames.Deaths);
private void OnLevelCompleted(int levelIndex, Node currentScene, double completionTime)
{
StatisticsManager.IncrementStat("levels_completed");
}
=> GameStateStore.Instance?.IncrementStat(StatNames.LevelsCompleted);
private void OnChildRescued(Vector2 position)
{
StatisticsManager.IncrementStat("children_rescued");
}
=> GameStateStore.Instance?.IncrementStat(StatNames.ChildrenRescued);
}