Autoloads/AchievementManager.cs

@@ -1,5 +1,6 @@
 using Godot;
 using Godot.Collections;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.scripts.Resources;
 
 namespace Mr.BrickAdventures.Autoloads;
@@ -15,7 +16,7 @@ public partial class AchievementManager : Node
 
     public override void _Ready()
     {
-        _gameManager = GetNode<GameManager>("/root/GameManager");
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
         LoadAchievementsFromFolder();
         LoadUnlockedAchievements();
     }

Autoloads/ConsoleManager.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.scripts.components;
 
 namespace Mr.BrickAdventures.Autoloads;
@@ -12,9 +13,9 @@ public partial class ConsoleManager : Node
 
     public override void _Ready()
     {
-        _gameManager = GetNode<GameManager>("/root/GameManager");
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
-        _achievementManager = GetNode<AchievementManager>("/root/AchievementManager");
+        _achievementManager = GetNode<AchievementManager>(Constants.AchievementManagerPath);
-        _skillManager = GetNode<SkillManager>("/root/SkillManager");
+        _skillManager = GetNode<SkillManager>(Constants.SkillManagerPath);
     }
 
     private void AddCoinsCommand(int amount)

Autoloads/GameManager.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Godot;
 using Godot.Collections;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.scripts.components;
 using Mr.BrickAdventures.scripts.Resources;
 using Double = System.Double;
@@ -55,7 +56,7 @@ public partial class GameManager : Node
 
     public override void _Ready()
     {
-        _speedRunManager = GetNode<SpeedRunManager>("/root/SpeedRunManager");
+        _speedRunManager = GetNode<SpeedRunManager>(Constants.SpeedRunManagerPath);
 
     }
 
@@ -186,7 +187,7 @@ public partial class GameManager : Node
         ResetPlayerState();
         ResetCurrentSessionState();
         GetTree().ChangeSceneToPacked(LevelScenes[0]);
-        GetNode<SaveSystem>("/root/SaveSystem").SaveGame();
+        GetNode<SaveSystem>(Constants.SaveSystemPath).SaveGame();
     }
 
     public void QuitGame() => GetTree().Quit();
@@ -202,12 +203,12 @@ public partial class GameManager : Node
         _speedRunManager?.StartTimer();
 
         GetTree().ChangeSceneToPacked(LevelScenes[0]);
-        GetNode<SaveSystem>("/root/SaveSystem").SaveGame();
+        GetNode<SaveSystem>(Constants.SaveSystemPath).SaveGame();
     }
 
     public void ContinueGame()
     {
-        var save = GetNode<SaveSystem>("/root/SaveSystem");
+        var save = GetNode<SaveSystem>(Constants.SaveSystemPath);
         if (!save.LoadGame())
         {
             GD.PrintErr("Failed to load game. Starting a new game instead.");
@@ -236,7 +237,7 @@ public partial class GameManager : Node
 
         ResetCurrentSessionState();
         TryToGoToNextLevel();
-        GetNode<SaveSystem>("/root/SaveSystem").SaveGame();
+        GetNode<SaveSystem>(Constants.SaveSystemPath).SaveGame();
     }
 
     public Array<SkillData> GetUnlockedSkills()

Autoloads/SaveSystem.cs

@@ -1,5 +1,6 @@
 using Godot;
 using Godot.Collections;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.scripts.Resources;
 
 namespace Mr.BrickAdventures.Autoloads;
@@ -13,7 +14,7 @@ public partial class SaveSystem : Node
 
     public override void _Ready()
     {
-        _gameManager = GetNode<GameManager>("/root/GameManager");
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
     }
 
     public void SaveGame()

Autoloads/SkillManager.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Godot;
 using Godot.Collections;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.scripts.components;
 using Mr.BrickAdventures.scripts.interfaces;
 using Mr.BrickAdventures.scripts.Resources;
@@ -24,7 +25,7 @@ public partial class SkillManager : Node
 
     public override void _Ready()
     {
-        _gameManager = GetNode<GameManager>("/root/GameManager");
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
     }
 
     /// <summary>

Autoloads/StatisticsManager.cs

@@ -1,5 +1,6 @@
 using Godot;
 using Godot.Collections;
+using Mr.BrickAdventures;
 
 namespace Mr.BrickAdventures.Autoloads;
 
@@ -11,8 +12,8 @@ public partial class StatisticsManager : Node
 
     public override void _Ready()
     {
-        _gameManager = GetNode<GameManager>("/root/GameManager");
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
-        _achievementManager = GetNode<AchievementManager>("/root/AchievementManager");
+        _achievementManager = GetNode<AchievementManager>(Constants.AchievementManagerPath);
         LoadStatistics();
     }
 

scripts/Constants.cs

@@ -17,6 +17,7 @@ public static class Constants
     public const string FloatingTextManagerPath = "/root/FloatingTextManager";
     public const string UIManagerPath = "/root/UIManager";
     public const string ConsoleManagerPath = "/root/ConsoleManager";
+    public const string ConfigFileHandlerPath = "/root/ConfigFileHandler";
 
     // Group names
     public const string CoinsGroup = "coins";

scripts/UI/AudioSettings.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 
 namespace Mr.BrickAdventures.scripts.UI;
@@ -16,8 +17,8 @@ public partial class AudioSettings : Control
 
     public override void _Ready()
     {
-        _uiManager = GetNode<UIManager>("/root/UIManager");
+        _uiManager = GetNode<UIManager>(Constants.UIManagerPath);
-        _configFileHandler = GetNode<ConfigFileHandler>("/root/ConfigFileHandler");
+        _configFileHandler = GetNode<ConfigFileHandler>(Constants.ConfigFileHandlerPath);
         Initialize();
         MasterVolumeSlider.ValueChanged += OnMasterVolumeChanged;
         MusicVolumeSlider.ValueChanged += OnMusicVolumeChanged;

scripts/UI/ChargeProgressBar.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 using Mr.BrickAdventures.scripts.components;
 using Mr.BrickAdventures.scripts.Resources;
@@ -17,7 +18,7 @@ public partial class ChargeProgressBar : ProgressBar
     {
         ProgressBar.Hide();
 
-        _skillManager = GetNodeOrNull<SkillManager>("/root/SkillManager");
+        _skillManager = GetNodeOrNull<SkillManager>(Constants.SkillManagerPath);
         if (_skillManager == null)
         {
             GD.PrintErr("ChargeProgressBar: SkillManager autoload not found.");

scripts/UI/Credits.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 
 namespace Mr.BrickAdventures.scripts.UI;
@@ -9,7 +10,7 @@ public partial class Credits : Control
 
     public override void _Ready()
     {
-        _uiManager = GetNode<UIManager>("/root/UIManager");
+        _uiManager = GetNode<UIManager>(Constants.UIManagerPath);
     }
 
     public override void _UnhandledInput(InputEvent @event)

scripts/UI/DeathScreen.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 using Mr.BrickAdventures.scripts.Resources;
 
@@ -18,7 +19,7 @@ public partial class DeathScreen : Control
 
     public override void _Ready()
     {
-        _gameManager = GetNode<GameManager>("/root/GameManager");
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
         SetLabels();
     }
 

scripts/UI/GameOverScreen.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 
 namespace Mr.BrickAdventures.scripts.UI;
@@ -14,7 +15,7 @@ public partial class GameOverScreen : Control
 
     public override void _Ready()
     {
-        _gameManager = GetNode<GameManager>("/root/GameManager");
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
         RestartButton.Pressed += OnRestartClicked;
         MainMenuButton.Pressed += OnMainMenuClicked;
     }

scripts/UI/Hud.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 using Mr.BrickAdventures.scripts.components;
 
@@ -15,7 +16,7 @@ public partial class Hud : Control
 
     public override void _Ready()
     {
-        _gameManager = GetNode<GameManager>("/root/GameManager");
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
     }
 
     public override void _Process(double delta)

scripts/UI/MainMenu.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 
 namespace Mr.BrickAdventures.scripts.UI;
@@ -21,9 +22,9 @@ public partial class MainMenu : Control
 
     public override void _Ready()
     {
-        _saveSystem = GetNode<SaveSystem>("/root/SaveSystem");
+        _saveSystem = GetNode<SaveSystem>(Constants.SaveSystemPath);
-        _gameManager = GetNode<GameManager>("/root/GameManager");
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
-        _uiManager = GetNode<UIManager>("/root/UIManager");
+        _uiManager = GetNode<UIManager>(Constants.UIManagerPath);
 
         NewGameButton.Pressed += OnNewGamePressed;
         ContinueButton.Pressed += OnContinuePressed;

scripts/UI/Marketplace.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Godot;
 using Godot.Collections;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 using Mr.BrickAdventures.scripts.components;
 using Mr.BrickAdventures.scripts.Resources;
@@ -25,8 +26,8 @@ public partial class Marketplace : Control
 
     public override void _Ready()
     {
-        _gameManager = GetNode<GameManager>("/root/GameManager");
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
-        _skillManager = GetNode<SkillManager>("/root/SkillManager");
+        _skillManager = GetNode<SkillManager>(Constants.SkillManagerPath);
         _skillManager.SkillRemoved += OnSkillRemoved;
 
         Skills = _skillManager.AvailableSkills;

scripts/UI/MarketplaceButton.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 using Mr.BrickAdventures.scripts.components;
 using Mr.BrickAdventures.scripts.Resources;
@@ -18,7 +19,7 @@ public partial class MarketplaceButton : Button
 
     public override void _Ready()
     {
-        _gameManager = GetNode<GameManager>("/root/GameManager");
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
         var player = _gameManager.Player;
         if (player == null) return;
 
@@ -28,7 +29,7 @@ public partial class MarketplaceButton : Button
             _skillUnlockerComponent.SkillUnlocked += OnSkillStateChanged;
         }
 
-        _skillManager = GetNode<SkillManager>("/root/SkillManager");
+        _skillManager = GetNode<SkillManager>(Constants.SkillManagerPath);
         _skillManager.SkillRemoved += OnSkillStateChanged;
 
         UpdateButtonState();

scripts/UI/PauseMenu.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 
 namespace Mr.BrickAdventures.scripts.UI;
@@ -18,8 +19,8 @@ public partial class PauseMenu : Control
 
     public override void _Ready()
     {
-        _gameManager = GetNode<GameManager>("/root/GameManager");
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
-        _uiManager = GetNode<UIManager>("/root/UIManager");
+        _uiManager = GetNode<UIManager>(Constants.UIManagerPath);
 
         ResumeButton.Pressed += OnResumePressed;
         MainMenuButton.Pressed += OnMainMenuPressed;

scripts/UI/SettingsMenu.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 
 namespace Mr.BrickAdventures.scripts.UI;
@@ -19,7 +20,7 @@ public partial class SettingsMenu : Control
 
     public override void _Ready()
     {
-        _uiManager = GetNode<UIManager>("/root/UIManager");
+        _uiManager = GetNode<UIManager>(Constants.UIManagerPath);
 
         InputSettingsButton.Pressed += OnInputSettingsPressed;
         AudioSettingsButton.Pressed += OnAudioSettingsPressed;

scripts/UI/SpeedRunHud.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 
 namespace Mr.BrickAdventures.scripts.UI;
@@ -12,7 +13,7 @@ public partial class SpeedRunHud : Control
 
     public override void _Ready()
     {
-        _speedRunManager = GetNode<SpeedRunManager>("/root/SpeedRunManager");
+        _speedRunManager = GetNode<SpeedRunManager>(Constants.SpeedRunManagerPath);
 
         _speedRunManager.TimeUpdated += OnTimerUpdated;
 

scripts/components/BrickShieldSkillComponent.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 using Mr.BrickAdventures.scripts.interfaces;
 using Mr.BrickAdventures.scripts.Resources;
@@ -19,8 +20,8 @@ public partial class BrickShieldSkillComponent : Node, ISkill
 
     public override void _Ready()
     {
-        _gameManager = GetNode<GameManager>("/root/GameManager");
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
-        _skillManager = GetNode<SkillManager>("/root/SkillManager");
+        _skillManager = GetNode<SkillManager>(Constants.SkillManagerPath);
     }
 
     public void Initialize(Node owner, SkillData data)

scripts/components/ExitDoorComponent.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 using Mr.BrickAdventures.scripts.interfaces;
 
@@ -20,8 +21,8 @@ public partial class ExitDoorComponent : Area2D, IUnlockable
 
     public override void _Ready()
     {
-        _gameManager = GetNode<GameManager>("/root/GameManager");
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
-        _achievementManager = GetNode<AchievementManager>("/root/AchievementManager");
+        _achievementManager = GetNode<AchievementManager>(Constants.AchievementManagerPath);
 
         BodyEntered += OnExitAreaBodyEntered;
 

scripts/components/LeverComponent.cs

@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 
 namespace Mr.BrickAdventures.scripts.components;
@@ -20,7 +21,7 @@ public partial class LeverComponent : Node
 
     public override void _Ready()
     {
-        _floatingTextManager = GetNode<FloatingTextManager>("/root/FloatingTextManager");
+        _floatingTextManager = GetNode<FloatingTextManager>(Constants.FloatingTextManagerPath);
 
         if (Area == null)
         {

scripts/components/PlayerController.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 
 namespace Mr.BrickAdventures.scripts.components;
@@ -33,7 +34,7 @@ public partial class PlayerController : CharacterBody2D
 
     public override void _Ready()
     {
-        var skillManager = GetNodeOrNull<SkillManager>("/root/SkillManager");
+        var skillManager = GetNodeOrNull<SkillManager>(Constants.SkillManagerPath);
         skillManager?.RegisterPlayer(this);
 
         _inputHandler = GetNode<PlayerInputHandler>("PlayerInputHandler");

scripts/components/PlayerDeathComponent.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 
 namespace Mr.BrickAdventures.scripts.components;
@@ -15,7 +16,7 @@ public partial class PlayerDeathComponent : Node2D
 
     public override void _Ready()
     {
-        _gameManager = GetNode<GameManager>("/root/GameManager");
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
         HealthComponent.Death += OnDeath;
     }
 

scripts/components/ScoreComponent.cs

@@ -1,43 +0,0 @@
-using Godot;
-using Mr.BrickAdventures.Autoloads;
-using Mr.BrickAdventures.scripts.Resources;
-
-namespace Mr.BrickAdventures.scripts.components;
-
-[GlobalClass]
-public partial class ScoreComponent : Node
-{
-    private GameManager _gameManager;
-    private const string CoinsGroupName = "coins";
-    
-    public override async void _Ready()
-    {
-        await ToSignal(GetTree(), SceneTree.SignalName.ProcessFrame);
-        
-        _gameManager = GetNode<GameManager>("/root/GameManager");
-        if (_gameManager == null)
-        {
-            GD.PrintErr("GameManager not found in the scene tree.");
-            return;
-        }
-
-        var coins = GetTree().GetNodesInGroup(CoinsGroupName);
-        foreach (var coin in coins)
-        {
-            var c = coin.GetNodeOrNull<CollectableComponent>("CollectableComponent");
-            if (c != null)
-            {
-                c.Collected += OnCollected;
-            }
-        }
-    }
-    
-    private void OnCollected(float amount, CollectableType type, Node2D body)
-    {
-        if (type != CollectableType.Coin) return;
-        
-        var coinAmount = (int)amount;
-        var currentCoins = (int)_gameManager.CurrentSessionState["coins_collected"];
-        _gameManager.CurrentSessionState["coins_collected"] = currentCoins + coinAmount;
-    }
-}

scripts/components/ScoreComponent.cs.uid

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

scripts/components/SkillUnlockerComponent.cs

@@ -1,5 +1,6 @@
 using Godot;
 using Godot.Collections;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 using Mr.BrickAdventures.scripts.interfaces;
 using Mr.BrickAdventures.scripts.Resources;
@@ -18,8 +19,8 @@ public partial class SkillUnlockerComponent : Node
 
     public override void _Ready()
     {
-        _gameManager = GetNode<GameManager>("/root/GameManager");
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
-        SkillManager = GetNode<SkillManager>("/root/SkillManager");
+        SkillManager = GetNode<SkillManager>(Constants.SkillManagerPath);
     }
 
     private bool HasEnoughCoins(int amount)