refactor: SaveSystem now uses a DTO for player state serialization and PlayerDeathComponent delegates state changes to event handlers.

.gitignore

@@ -1,5 +1,4 @@
 # Godot 4+ specific ignores
 .godot/
 /android/
-builds/
+builds/
-.worktrees/

Autoloads/AchievementManager.cs

@@ -9,8 +9,6 @@ namespace Mr.BrickAdventures.Autoloads;
 /// </summary>
 public partial class AchievementManager : Node
 {
-    public static AchievementManager Instance { get; private set; }
-
     [Export] private string AchievementsFolderPath = "res://achievements/";
     [Export] private PackedScene AchievementPopupScene { get; set; }
 
@@ -18,15 +16,9 @@ public partial class AchievementManager : Node
 
     public override void _Ready()
     {
-        Instance = this;
         LoadAchievementsFromFolder();
     }
 
-    public override void _ExitTree()
-    {
-        if (Instance == this) Instance = null;
-    }
-
     private void LoadAchievementsFromFolder()
     {
         using var dir = DirAccess.Open(AchievementsFolderPath);
@@ -77,7 +69,6 @@ public partial class AchievementManager : Node
         // 1. Mark as unlocked
         unlockedIds.Add(achievementId);
         GD.Print($"Achievement Unlocked: {achievement.DisplayName}");
-        EventBus.EmitAchievementUnlocked(achievementId);
 
         // 2. Show the UI popup
         if (AchievementPopupScene != null)

Autoloads/ConfigFileHandler.cs

@@ -4,16 +4,13 @@ namespace Mr.BrickAdventures.Autoloads;
 
 public partial class ConfigFileHandler : Node
 {
-    public static ConfigFileHandler Instance { get; private set; }
-
     private ConfigFile _settingsConfig = new();
     public const string SettingsPath = "user://settings.ini";
-
+    
     public ConfigFile SettingsConfig => _settingsConfig;
 
     public override void _Ready()
     {
-        Instance = this;
         if (!FileAccess.FileExists(SettingsPath))
         {
             var err = _settingsConfig.Save(SettingsPath);
@@ -27,9 +24,4 @@ public partial class ConfigFileHandler : Node
                 GD.PushError($"Failed to load settings file at {SettingsPath}: {err}");
         }
     }
-
-    public override void _ExitTree()
-    {
-        if (Instance == this) Instance = null;
-    }
 }

Autoloads/ConsoleManager.cs

@@ -1,120 +1,133 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.scripts.components;
 
 namespace Mr.BrickAdventures.Autoloads;
 
 public partial class ConsoleManager : Node
 {
-    private GameStateStore Store => GameStateStore.Instance;
+    private GameManager _gameManager;
-    private GameManager GameManager => GameManager.Instance;
-    private AchievementManager AchievementManager => AchievementManager.Instance;
     private SkillManager _skillManager;
     private SkillUnlockerComponent _skillUnlockerComponent;
+    private AchievementManager _achievementManager;
 
     public override void _Ready()
     {
-        _skillManager = SkillManager.Instance;
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
+        _achievementManager = GetNode<AchievementManager>(Constants.AchievementManagerPath);
+        _skillManager = GetNode<SkillManager>(Constants.SkillManagerPath);
     }
 
     private void AddCoinsCommand(int amount)
     {
-        if (Store == null) return;
+        _gameManager.AddCoins(amount);
-        Store.Player.Coins += amount;
-        EventBus.EmitCoinsChanged(Store.GetTotalCoins());
     }
 
     private void SetCoinsCommand(int amount)
     {
-        if (Store == null) return;
+        _gameManager.SetCoins(amount);
-        Store.Player.Coins = Mathf.Max(0, amount);
-        EventBus.EmitCoinsChanged(Store.GetTotalCoins());
     }
 
     private void SetLivesCommand(int amount)
     {
-        if (Store == null) return;
+        _gameManager.SetLives(amount);
-        Store.Player.Lives = amount;
-        EventBus.EmitLivesChanged(amount);
     }
 
     private void AddLivesCommand(int amount)
     {
-        Store?.AddLives(amount);
+        _gameManager.AddLives(amount);
     }
 
     private void SetHealthCommand(float amount)
     {
-        var playerHealthComponent = GameManager?.Player?.GetNode<HealthComponent>("HealthComponent");
+        var playerHealthComponent = _gameManager.Player.GetNode<HealthComponent>("HealthComponent");
         if (playerHealthComponent != null)
+        {
             playerHealthComponent.Health = amount;
+        }
     }
 
     private void ResetSessionCommand()
     {
-        Store?.ResetSession();
+        _gameManager.ResetCurrentSessionState();
     }
 
     private void UnlockSkillCommand(string skillName)
     {
-        if (!EnsureSkillManagement()) return;
+        if (!GetSkillManagement()) return;
 
         var skill = _skillManager.GetSkillByName(skillName);
-        if (skill == null) return;
+        if (skill == null)
+        {
+            return;
+        }
 
-        Store?.UnlockSkillPermanently(skill);
+        _gameManager.UnlockSkill(skill);
         _skillManager.ActivateSkill(skill);
         _skillUnlockerComponent.EmitSignal(SkillUnlockerComponent.SignalName.SkillUnlocked, skill);
     }
 
+    private bool GetSkillManagement()
+    {
+        var player = _gameManager.Player;
+        if (player == null || !IsInstanceValid(player))
+        {
+            return false;
+        }
+
+        _skillUnlockerComponent ??= player.GetNode<SkillUnlockerComponent>("SkillUnlockerComponent");
+
+        if (_skillManager != null && _skillUnlockerComponent != null) return true;
+
+        return false;
+
+    }
+
     private void UnlockAllSkillsCommand()
     {
-        if (!EnsureSkillManagement()) return;
+        if (!GetSkillManagement()) return;
+
         _skillUnlockerComponent.UnlockAllSkills();
     }
 
     private void RemoveSkillCommand(string skillName)
     {
-        if (!EnsureSkillManagement()) return;
+        if (!GetSkillManagement()) return;
 
         var skill = _skillManager.GetSkillByName(skillName);
-        if (skill == null) return;
+        if (skill == null)
+        {
+            return;
+        }
 
-        Store?.RemoveUnlockedSkill(skill.Name);
+        _gameManager.RemoveSkill(skill.Name);
         _skillManager.DeactivateSkill(skill);
     }
 
     private void RemoveAllSkillsCommand()
     {
-        if (!EnsureSkillManagement()) return;
+        if (!GetSkillManagement()) return;
 
         foreach (var skill in _skillManager.AvailableSkills)
         {
-            Store?.RemoveUnlockedSkill(skill.Name);
+            _gameManager.RemoveSkill(skill.Name);
             _skillManager.DeactivateSkill(skill);
         }
     }
 
     private void GoToNextLevelCommand()
     {
-        GameManager?.OnLevelComplete();
+        _gameManager.OnLevelComplete();
     }
 
     private void UnlockAchievementCommand(string achievementId)
     {
-        AchievementManager?.UnlockAchievement(achievementId);
+        _achievementManager.UnlockAchievement(achievementId);
     }
 
     private void ResetAchievementCommand(string achievementId)
     {
-        AchievementManager?.LockAchievement(achievementId);
+        _achievementManager.LockAchievement(achievementId);
     }
 
-    private bool EnsureSkillManagement()
+}
-    {
-        var player = GameManager?.Player;
-        if (player == null || !IsInstanceValid(player)) return false;
-
-        _skillUnlockerComponent ??= player.GetNode<SkillUnlockerComponent>("SkillUnlockerComponent");
-        return _skillManager != null && _skillUnlockerComponent != null;
-    }
-}

Autoloads/EventBus.cs

@@ -82,7 +82,6 @@ public partial class EventBus : Node
     [Signal] public delegate void CoinCollectedEventHandler(int amount, Vector2 position);
     [Signal] public delegate void ItemCollectedEventHandler(CollectableType itemType, float amount, Vector2 position);
     [Signal] public delegate void ChildRescuedEventHandler(Vector2 position);
-    [Signal] public delegate void SkillCollectedEventHandler(SkillData skill, Vector2 position);
 
     public static void EmitCoinCollected(int amount, Vector2 position)
         => Instance?.EmitSignal(SignalName.CoinCollected, amount, position);
@@ -93,9 +92,6 @@ public partial class EventBus : Node
     public static void EmitChildRescued(Vector2 position)
         => Instance?.EmitSignal(SignalName.ChildRescued, position);
 
-    public static void EmitSkillCollected(SkillData skill, Vector2 position)
-        => Instance?.EmitSignal(SignalName.SkillCollected, skill, position);
-
     #endregion
 
     #region Skill Events
@@ -140,15 +136,6 @@ public partial class EventBus : Node
 
     #endregion
 
-    #region Achievement Events
-
-    [Signal] public delegate void AchievementUnlockedEventHandler(string achievementId);
-
-    public static void EmitAchievementUnlocked(string achievementId)
-        => Instance?.EmitSignal(SignalName.AchievementUnlocked, achievementId);
-
-    #endregion
-
     #region State Change Events
 
     [Signal] public delegate void CoinsChangedEventHandler(int totalCoins);

Autoloads/FloatingTextManager.cs

@@ -1,7 +1,5 @@
-using System;
 using System.Globalization;
 using Godot;
-using Mr.BrickAdventures.scripts.Resources;
 using Mr.BrickAdventures.scripts.UI;
 
 namespace Mr.BrickAdventures.Autoloads;
@@ -9,34 +7,22 @@ namespace Mr.BrickAdventures.Autoloads;
 public partial class FloatingTextManager : Node
 {
     [Export] public PackedScene FloatingTextScene { get; set; }
-
+    
     [ExportGroup("Colors")]
     [Export] public Color DamageColor { get; set; } = new Color("#b21030"); // Red
     [Export] public Color HealColor { get; set; } = new Color("#71f341");   // Green
     [Export] public Color CoinColor { get; set; } = new Color("#ebd320");   // Gold
     [Export] public Color MessageColor { get; set; } = new Color("#ffffff"); // White
-
+    
-    public static FloatingTextManager Instance { get; private set; }
-
-    public override void _Ready()
-    {
-        Instance = this;
-    }
-
-    public override void _ExitTree()
-    {
-        if (Instance == this) Instance = null;
-    }
-
     public void ShowDamage(float amount, Vector2 position)
     {
         var text = Mathf.Round(amount * 100f).ToString(CultureInfo.InvariantCulture);
         CreateFloatingText(text, position, DamageColor);
     }
-
+    
     public void ShowHeal(float amount, Vector2 position)
     {
-        var text = $"+{Mathf.Round(amount * 100f).ToString(CultureInfo.InvariantCulture)}";
+        var text = $"+{Mathf.Round(amount)}";
         CreateFloatingText(text, position, HealColor);
     }
 
@@ -45,12 +31,12 @@ public partial class FloatingTextManager : Node
         var text = $"+{amount}";
         CreateFloatingText(text, position, CoinColor);
     }
-
+    
     public void ShowMessage(string message, Vector2 position)
     {
         CreateFloatingText(message, position, MessageColor);
     }
-
+    
     private void CreateFloatingText(string text, Vector2 position, Color color)
     {
         if (FloatingTextScene == null)

Autoloads/GameManager.cs

@@ -1,12 +1,15 @@
+using System.Collections.Generic;
 using Godot;
 using Godot.Collections;
 using Mr.BrickAdventures.scripts.components;
+using Mr.BrickAdventures.scripts.Resources;
+using Mr.BrickAdventures.scripts.State;
 
 namespace Mr.BrickAdventures.Autoloads;
 
 /// <summary>
-/// Game orchestrator - handles scene transitions and game flow.
+/// Game orchestrator - handles scene management and game flow.
-/// State lives in GameStateStore; query it directly for reads/writes.
+/// State is delegated to GameStateStore for better separation of concerns.
 /// </summary>
 public partial class GameManager : Node
 {
@@ -18,101 +21,175 @@ public partial class GameManager : Node
         private set => _player = value;
     }
 
+    private List<Node> _sceneNodes = [];
     private PlayerController _player;
-    private SpeedRunManager SpeedRunManager => SpeedRunManager.Instance;
+    private SpeedRunManager _speedRunManager;
+
+    /// <summary>
+    /// Lazy accessor for GameStateStore - avoids initialization order issues.
+    /// </summary>
     private GameStateStore Store => GameStateStore.Instance;
 
-    public static GameManager Instance { get; private set; }
+    public override void _EnterTree()
-
-    public override void _Ready()
     {
-        Instance = this;
+        GetTree().NodeAdded += OnNodeAdded;
-        EventBus.Instance.PlayerSpawned += OnPlayerSpawned;
+        GetTree().NodeRemoved += OnNodeRemoved;
     }
 
     public override void _ExitTree()
     {
-        if (Instance == this) Instance = null;
+        GetTree().NodeAdded -= OnNodeAdded;
-        if (EventBus.Instance != null)
+        GetTree().NodeRemoved -= OnNodeRemoved;
-            EventBus.Instance.PlayerSpawned -= OnPlayerSpawned;
+        _sceneNodes.Clear();
     }
 
-    private void OnPlayerSpawned(PlayerController player)
+    public override void _Ready()
     {
-        _player = player;
+        _speedRunManager = GetNode<SpeedRunManager>(Constants.SpeedRunManagerPath);
-        player.TreeExiting += () => { if (_player == player) _player = null; };
     }
 
-    #region Game Flow
+    private void OnNodeAdded(Node node)
-
-    public void StartNewGame()
     {
-        Store?.ResetAll();
+        _sceneNodes.Add(node);
-        SpeedRunManager?.StartTimer();
-        GetTree().ChangeSceneToPacked(LevelScenes[0]);
-        SaveSystem.Instance.SaveGame();
-        EventBus.EmitGameStarted();
     }
 
-    public void ContinueGame()
+    private void OnNodeRemoved(Node node)
     {
-        var save = SaveSystem.Instance;
+        _sceneNodes.Remove(node);
-        if (!save.LoadGame())
+        if (node == _player)
         {
-            GD.PrintErr("Failed to load game. Starting a new game instead.");
+            _player = null;
-            StartNewGame();
-            return;
-        }
-
-        var idx = Store?.Player.CurrentLevel ?? 0;
-        if (idx < LevelScenes.Count)
-        {
-            GetTree().ChangeSceneToPacked(LevelScenes[idx]);
-            EventBus.EmitGameContinued();
-        }
-        else
-        {
-            GD.PrintErr("No levels unlocked to continue.");
         }
     }
 
-    public void RestartGame()
+    #region Coin Operations
+
+    public void AddCoins(int amount)
     {
-        Store?.ResetAll();
+        if (Store != null)
-        GetTree().ChangeSceneToPacked(LevelScenes[0]);
+        {
-        SaveSystem.Instance.SaveGame();
+            Store.Player.Coins += amount;
+            EventBus.EmitCoinsChanged(Store.GetTotalCoins());
+        }
     }
 
-    public void OnLevelComplete()
+    public void SetCoins(int amount)
+    {
+        if (Store != null)
+        {
+            Store.Player.Coins = Mathf.Max(0, amount);
+            EventBus.EmitCoinsChanged(Store.GetTotalCoins());
+        }
+    }
+
+    public int GetCoins() => Store?.GetTotalCoins() ?? 0;
+
+    public void RemoveCoins(int amount) => Store?.RemoveCoins(amount);
+
+    #endregion
+
+    #region Lives Operations
+
+    public void AddLives(int amount) => Store?.AddLives(amount);
+    public void RemoveLives(int amount) => Store?.RemoveLife();
+    public void SetLives(int amount)
+    {
+        if (Store != null)
+        {
+            Store.Player.Lives = amount;
+            EventBus.EmitLivesChanged(amount);
+        }
+    }
+    public int GetLives() => Store?.Player.Lives ?? 0;
+
+    #endregion
+
+    #region Skill Operations
+
+    public bool IsSkillUnlocked(SkillData skill) => Store?.IsSkillUnlocked(skill) ?? false;
+
+    public void UnlockSkill(SkillData skill)
+    {
+        if (Store != null && !Store.IsSkillUnlocked(skill))
+        {
+            Store.Player.UnlockedSkills.Add(skill);
+        }
+    }
+
+    public void RemoveSkill(string skillName)
     {
         if (Store == null) return;
-
+        var skills = Store.Player.UnlockedSkills;
-        var levelIndex = Store.Player.CurrentLevel;
+        for (int i = 0; i < skills.Count; i++)
-        Store.MarkLevelComplete(levelIndex);
+        {
-        Store.CommitSessionCoins();
+            if (skills[i].Name == skillName)
-        Store.CommitSessionSkills();
+            {
-
+                skills.RemoveAt(i);
-        var completionTime = SpeedRunManager?.GetCurrentLevelTime() ?? 0.0;
+                break;
-        EventBus.EmitLevelCompleted(levelIndex, GetTree().CurrentScene, completionTime);
+            }
-
+        }
-        Store.ResetSession();
-        TryToGoToNextLevel();
-        SaveSystem.Instance.SaveGame();
     }
 
+    public void UnlockSkills(Array<SkillData> skills)
+    {
+        foreach (var s in skills)
+            UnlockSkill(s);
+    }
+
+    public Array<SkillData> GetUnlockedSkills()
+    {
+        if (Store == null) return new Array<SkillData>();
+
+        var result = new Array<SkillData>();
+        foreach (var s in Store.Player.UnlockedSkills)
+            result.Add(s);
+        foreach (var s in Store.Session.SkillsUnlocked)
+            if (!result.Contains(s)) result.Add(s);
+        return result;
+    }
+
+    #endregion
+
+    #region Level Operations
+
+    public void UnlockLevel(int levelIndex) => Store?.UnlockLevel(levelIndex);
+
+    public void MarkLevelComplete(int levelIndex) => Store?.MarkLevelComplete(levelIndex);
+
     public void TryToGoToNextLevel()
     {
         if (Store == null) return;
 
-        var next = Store.Player.CurrentLevel + 1;
+        var next = Store.Session.CurrentLevel + 1;
         if (next < LevelScenes.Count && Store.IsLevelUnlocked(next))
         {
-            Store.Player.CurrentLevel = next;
+            Store.Session.CurrentLevel = next;
             GetTree().ChangeSceneToPacked(LevelScenes[next]);
             EventBus.EmitLevelStarted(next, GetTree().CurrentScene);
         }
     }
 
+    #endregion
+
+    #region State Reset
+
+    public void ResetPlayerState() => Store?.ResetAll();
+
+    public void ResetCurrentSessionState() => Store?.ResetSession();
+
+    #endregion
+
+    #region Game Flow
+
+    public void RestartGame()
+    {
+        Store?.ResetAll();
+        GetTree().ChangeSceneToPacked(LevelScenes[0]);
+        GetNode<SaveSystem>(Constants.SaveSystemPath).SaveGame();
+    }
+
+    public void QuitGame() => GetTree().Quit();
+
     public void PauseGame()
     {
         Engine.TimeScale = 0;
@@ -125,7 +202,53 @@ public partial class GameManager : Node
         EventBus.EmitGameResumed();
     }
 
-    public void QuitGame() => GetTree().Quit();
+    public void StartNewGame()
+    {
+        Store?.ResetAll();
+        _speedRunManager?.StartTimer();
+        GetTree().ChangeSceneToPacked(LevelScenes[0]);
+        GetNode<SaveSystem>(Constants.SaveSystemPath).SaveGame();
+        EventBus.EmitGameStarted();
+    }
+
+    public void ContinueGame()
+    {
+        var save = GetNode<SaveSystem>(Constants.SaveSystemPath);
+        if (!save.LoadGame())
+        {
+            GD.PrintErr("Failed to load game. Starting a new game instead.");
+            StartNewGame();
+            return;
+        }
+
+        var idx = Store?.Session.CurrentLevel ?? 0;
+        if (idx < LevelScenes.Count)
+        {
+            GetTree().ChangeSceneToPacked(LevelScenes[idx]);
+            EventBus.EmitGameContinued();
+        }
+        else
+        {
+            GD.PrintErr("No levels unlocked to continue.");
+        }
+    }
+
+    public void OnLevelComplete()
+    {
+        if (Store == null) return;
+
+        var levelIndex = Store.Session.CurrentLevel;
+        Store.MarkLevelComplete(levelIndex);
+        Store.CommitSessionCoins();
+        Store.CommitSessionSkills();
+
+        var completionTime = _speedRunManager?.GetCurrentLevelTime() ?? 0.0;
+        EventBus.EmitLevelCompleted(levelIndex, GetTree().CurrentScene, completionTime);
+
+        Store.ResetSession();
+        TryToGoToNextLevel();
+        GetNode<SaveSystem>(Constants.SaveSystemPath).SaveGame();
+    }
 
     #endregion
 
@@ -134,9 +257,20 @@ public partial class GameManager : Node
     public PlayerController GetPlayer()
     {
         if (_player != null && IsInstanceValid(_player)) return _player;
+
         _player = null;
+
+        foreach (var node in _sceneNodes)
+        {
+            if (node is not PlayerController player) continue;
+
+            _player = player;
+            return _player;
+        }
+
+        GD.PrintErr("PlayerController not found in the scene tree.");
         return null;
     }
 
     #endregion
-}
+}

Autoloads/GameStateStore.cs

@@ -1,5 +1,4 @@
 using Godot;
-using System.Collections.Generic;
 using Mr.BrickAdventures.scripts.Resources;
 using Mr.BrickAdventures.scripts.State;
 
@@ -143,7 +142,7 @@ public partial class GameStateStore : Node
     }
 
     /// <summary>
-    /// Unlocks a skill in the session (lost on death, committed on level complete).
+    /// Unlocks a skill in the session.
     /// </summary>
     public void UnlockSkillInSession(SkillData skill)
     {
@@ -151,30 +150,6 @@ public partial class GameStateStore : Node
             Session.SkillsUnlocked.Add(skill);
     }
 
-    /// <summary>
-    /// Permanently unlocks a skill directly in player state (bypasses session, e.g. console commands).
-    /// </summary>
-    public void UnlockSkillPermanently(SkillData skill)
-    {
-        if (!Player.UnlockedSkills.Contains(skill))
-            Player.UnlockedSkills.Add(skill);
-    }
-
-    /// <summary>
-    /// Removes a permanently unlocked skill from player state by name.
-    /// </summary>
-    public void RemoveUnlockedSkill(string skillName)
-    {
-        for (int i = 0; i < Player.UnlockedSkills.Count; i++)
-        {
-            if (Player.UnlockedSkills[i].Name == skillName)
-            {
-                Player.UnlockedSkills.RemoveAt(i);
-                return;
-            }
-        }
-    }
-
     /// <summary>
     /// Commits session skills to player state.
     /// </summary>
@@ -188,39 +163,6 @@ public partial class GameStateStore : Node
         Session.SkillsUnlocked.Clear();
     }
 
-    /// <summary>
-    /// Gets all unlocked skills from player persistence and current session.
-    /// </summary>
-    public List<SkillData> GetAllUnlockedSkills()
-    {
-        var result = new List<SkillData>(Player.UnlockedSkills);
-        foreach (var skill in Session.SkillsUnlocked)
-        {
-            if (!result.Contains(skill)) result.Add(skill);
-        }
-        return result;
-    }
-
-    #endregion
-
-    #region Statistics Operations
-
-    public void IncrementStat(string name, int amount = 1)
-    {
-        if (Player.Statistics.TryGetValue(name, out var current))
-            Player.Statistics[name] = current + amount;
-        else
-            Player.Statistics[name] = amount;
-    }
-
-    public void SetStat(string name, int value) => Player.Statistics[name] = value;
-
-    public int GetStat(string name) =>
-        Player.Statistics.TryGetValue(name, out var value) ? value : 0;
-
-    public System.Collections.Generic.Dictionary<string, int> GetAllStats() =>
-        new(Player.Statistics);
-
     #endregion
 
     #region Reset Operations

Autoloads/GhostManager.cs

@@ -1,20 +1,14 @@
 using System.Collections.Generic;
-using System.Text.Json;
 using Godot;
+using Godot.Collections;
 using Mr.BrickAdventures.scripts;
-using Mr.BrickAdventures.scripts.State;
 
 namespace Mr.BrickAdventures.Autoloads;
 
 public partial class GhostManager : Node
 {
-    public static GhostManager Instance { get; private set; }
-
     [Export] private PackedScene GhostPlayerScene { get; set; }
-
+    
-    public override void _Ready() => Instance = this;
-    public override void _ExitTree() { if (Instance == this) Instance = null; }
-
     public bool IsRecording { get; private set; } = false;
     public bool IsPlaybackEnabled { get; private set; } = true;
 
@@ -25,14 +19,14 @@ public partial class GhostManager : Node
     public void StartRecording(int levelIndex)
     {
         if (!IsPlaybackEnabled) return;
-
+        
         _currentLevelIndex = levelIndex;
         _currentRecording.Clear();
         _startTime = Time.GetTicksMsec() / 1000.0;
         IsRecording = true;
         GD.Print("Ghost recording started.");
     }
-
+    
     public void StopRecording(bool levelCompleted, double finalTime)
     {
         if (!IsRecording) return;
@@ -49,22 +43,23 @@ public partial class GhostManager : Node
         }
         _currentRecording.Clear();
     }
-
+    
     public void RecordFrame(Vector2 position)
     {
         if (!IsRecording) return;
 
-        _currentRecording.Add(new GhostFrame
+        var frame = new GhostFrame
         {
             Timestamp = (Time.GetTicksMsec() / 1000.0) - _startTime,
             Position = position
-        });
+        };
+        _currentRecording.Add(frame);
     }
-
+    
     public void SpawnGhostPlayer(int levelIndex, Node parent)
     {
         if (!IsPlaybackEnabled || GhostPlayerScene == null) return;
-
+        
         var ghostData = LoadGhostData(levelIndex);
         if (ghostData.Count > 0)
         {
@@ -74,63 +69,44 @@ public partial class GhostManager : Node
             GD.Print($"Ghost player spawned for level {levelIndex}.");
         }
     }
-
+    
     private void SaveGhostData(int levelIndex, double time)
     {
-        var path = $"user://ghost_level_{levelIndex}.json";
+        var path = $"user://ghost_level_{levelIndex}.dat";
-        var saveData = new GhostSaveData { BestTime = time };
+        using var file = FileAccess.Open(path, FileAccess.ModeFlags.Write);
-        foreach (var frame in _currentRecording)
+        
-            saveData.Frames.Add(new GhostFrameDto { Timestamp = frame.Timestamp, X = frame.Position.X, Y = frame.Position.Y });
+        var dataToSave = new Godot.Collections.Dictionary
-
-        try
         {
-            var json = JsonSerializer.Serialize(saveData, SaveSystem.JsonOptions);
+            { "time", time },
-            using var file = FileAccess.Open(path, FileAccess.ModeFlags.Write);
+            { "frames", _currentRecording.ToArray() }
-            file.StoreString(json);
+        };
-        }
+        file.StoreVar(dataToSave);
-        catch (System.Exception e)
-        {
-            GD.PrintErr($"GhostManager: Failed to save ghost data: {e.Message}");
-        }
     }
-
+    
     private List<GhostFrame> LoadGhostData(int levelIndex)
     {
-        var path = $"user://ghost_level_{levelIndex}.json";
+        var path = $"user://ghost_level_{levelIndex}.dat";
         if (!FileAccess.FileExists(path)) return [];
 
-        try
+        using var file = FileAccess.Open(path, FileAccess.ModeFlags.Read);
+        var savedData = (Dictionary)file.GetVar();
+        var framesArray = (Array)savedData["frames"];
+        
+        var frames = new List<GhostFrame>();
+        foreach (var obj in framesArray)
         {
-            using var file = FileAccess.Open(path, FileAccess.ModeFlags.Read);
+            frames.Add((GhostFrame)obj);
-            var saveData = JsonSerializer.Deserialize<GhostSaveData>(file.GetAsText(), SaveSystem.JsonOptions);
-            if (saveData == null) return [];
-
-            var frames = new List<GhostFrame>();
-            foreach (var dto in saveData.Frames)
-                frames.Add(new GhostFrame { Timestamp = dto.Timestamp, Position = new Vector2(dto.X, dto.Y) });
-            return frames;
-        }
-        catch (System.Exception e)
-        {
-            GD.PrintErr($"GhostManager: Failed to load ghost data: {e.Message}");
-            return [];
         }
+        return frames;
     }
-
+    
     private double LoadBestTime(int levelIndex)
     {
-        var path = $"user://ghost_level_{levelIndex}.json";
+        var path = $"user://ghost_level_{levelIndex}.dat";
         if (!FileAccess.FileExists(path)) return double.MaxValue;
 
-        try
+        using var file = FileAccess.Open(path, FileAccess.ModeFlags.Read);
-        {
+        var data = (Dictionary)file.GetVar();
-            using var file = FileAccess.Open(path, FileAccess.ModeFlags.Read);
+        return (double)data["time"];
-            var saveData = JsonSerializer.Deserialize<GhostSaveData>(file.GetAsText(), SaveSystem.JsonOptions);
-            return saveData?.BestTime ?? double.MaxValue;
-        }
-        catch
-        {
-            return double.MaxValue;
-        }
     }
-}
+}

Autoloads/InputDeviceManager.cs

@@ -1,54 +0,0 @@
-using Godot;
-
-namespace Mr.BrickAdventures.Autoloads;
-
-public partial class InputDeviceManager : Node
-{
-    public enum InputDevice { Mouse, Keyboard, Gamepad }
-    public static InputDeviceManager Instance { get; private set; }
-
-    public InputDevice CurrentDevice { get; private set; } = InputDevice.Mouse;
-
-    public bool IsPointerless => CurrentDevice is InputDevice.Keyboard or InputDevice.Gamepad;
-
-    [Signal] public delegate void DeviceChangedEventHandler(int device);
-
-    public override void _Ready()
-    {
-        Instance = this;
-        Input.MouseMode = Input.MouseModeEnum.Visible;
-    }
-
-    public override void _ExitTree()
-    {
-        if (Instance == this) Instance = null;
-    }
-
-    public override void _Input(InputEvent @event)
-    {
-        InputDevice detected;
-
-        if (@event is InputEventMouseMotion or InputEventMouseButton)
-            detected = InputDevice.Mouse;
-        else if (@event is InputEventKey)
-            detected = InputDevice.Keyboard;
-        else if (@event is InputEventJoypadButton)
-            detected = InputDevice.Gamepad;
-        else if (@event is InputEventJoypadMotion joyEvent)
-        {
-            if (Mathf.Abs(joyEvent.AxisValue) <= 0.15f) return;
-            detected = InputDevice.Gamepad;
-        }
-        else
-            return;
-
-        if (detected == CurrentDevice) return;
-
-        CurrentDevice = detected;
-        Input.MouseMode = CurrentDevice == InputDevice.Mouse
-            ? Input.MouseModeEnum.Visible
-            : Input.MouseModeEnum.Hidden;
-
-        EmitSignal(SignalName.DeviceChanged, (int)CurrentDevice);
-    }
-}

Autoloads/InputDeviceManager.cs.uid

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

Autoloads/SaveSystem.cs

@@ -14,24 +14,12 @@ public partial class SaveSystem : Node
     [Export] public string SavePath { get; set; } = "user://savegame.json";
     [Export] public int Version { get; set; } = 2;
 
-    public static SaveSystem Instance { get; private set; }
+    private static readonly JsonSerializerOptions JsonOptions = new()
-
-    internal static readonly JsonSerializerOptions JsonOptions = new()
     {
         WriteIndented = true,
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase
     };
 
-    public override void _Ready()
-    {
-        Instance = this;
-    }
-
-    public override void _ExitTree()
-    {
-        if (Instance == this) Instance = null;
-    }
-
     public void SaveGame()
     {
         var store = GameStateStore.Instance;
@@ -47,7 +35,7 @@ public partial class SaveSystem : Node
             Version = Version,
             Coins = store.Player.Coins,
             Lives = store.Player.Lives,
-            CurrentLevel = store.Player.CurrentLevel,
+            CurrentLevel = store.Session.CurrentLevel,
             CompletedLevels = [.. store.Player.CompletedLevels],
             UnlockedLevels = new List<int>(store.Player.UnlockedLevels),
             UnlockedSkillNames = GetSkillNames(store.Player.UnlockedSkills),
@@ -105,7 +93,7 @@ public partial class SaveSystem : Node
             // Apply loaded state
             store.Player.Coins = saveData.Coins;
             store.Player.Lives = saveData.Lives;
-            store.Player.CurrentLevel = saveData.CurrentLevel;
+            store.Session.CurrentLevel = saveData.CurrentLevel;
 
             store.Player.CompletedLevels = saveData.CompletedLevels ?? new List<int>();
             store.Player.UnlockedLevels = saveData.UnlockedLevels ?? new List<int> { 0 };
@@ -141,7 +129,7 @@ public partial class SaveSystem : Node
         var skills = new List<SkillData>();
         if (skillNames == null) return skills;
 
-        var skillManager = SkillManager.Instance;
+        var skillManager = GetNodeOrNull<SkillManager>(Constants.SkillManagerPath);
         if (skillManager == null)
         {
             GD.PrintErr("SaveSystem: SkillManager not available to resolve skill names.");
@@ -174,3 +162,19 @@ public partial class SaveSystem : Node
         }
     }
 }
+
+/// <summary>
+/// Serializable DTO for save data - no Godot types.
+/// </summary>
+public class SaveDataDto
+{
+    public int Version { get; set; }
+    public int Coins { get; set; }
+    public int Lives { get; set; }
+    public int CurrentLevel { get; set; }
+    public List<int> CompletedLevels { get; set; }
+    public List<int> UnlockedLevels { get; set; }
+    public List<string> UnlockedSkillNames { get; set; }
+    public List<string> UnlockedAchievements { get; set; }
+    public Dictionary<string, int> Statistics { get; set; }
+}

Autoloads/SettingsManager.cs

@@ -1,203 +0,0 @@
-using Godot;
-using System.Collections.Generic;
-
-namespace Mr.BrickAdventures.Autoloads;
-
-public partial class SettingsManager : Node
-{
-    public static SettingsManager Instance { get; private set; }
-
-    public float GamepadDeadzone { get; set; } = 0.2f;
-    public float GamepadSensitivity { get; set; } = 1.0f;
-    public string WindowMode { get; set; } = "fullscreen";
-    public Vector2I Resolution { get; set; } = new Vector2I(1920, 1080);
-
-    private static readonly List<Vector2I> CuratedResolutions = new()
-    {
-        // 4:3
-        new Vector2I(640, 480),
-        new Vector2I(800, 600),
-        new Vector2I(1024, 768),
-        new Vector2I(1280, 960),
-        new Vector2I(1600, 1200),
-        // 16:9
-        new Vector2I(1280, 720),
-        new Vector2I(1366, 768),
-        new Vector2I(1600, 900),
-        new Vector2I(1920, 1080),
-        new Vector2I(2560, 1440),
-        new Vector2I(3840, 2160),
-        // 16:10
-        new Vector2I(1280, 800),
-        new Vector2I(1440, 900),
-        new Vector2I(1920, 1200),
-        new Vector2I(2560, 1600),
-    };
-
-    private readonly List<Vector2I> _customResolutions = new();
-
-    private static readonly string[] DeadzoneActions = { "left", "right", "up", "down" };
-
-    public override void _Ready()
-    {
-        Instance = this;
-
-        if (ConfigFileHandler.Instance == null)
-        {
-            GD.PushError("SettingsManager: ConfigFileHandler.Instance is null");
-            return;
-        }
-
-        var cfg = ConfigFileHandler.Instance.SettingsConfig;
-
-        // --- display_settings ---
-        WindowMode = cfg.GetValue("display_settings", "window_mode", Variant.From("fullscreen")).AsString();
-        var resStr = cfg.GetValue("display_settings", "resolution", Variant.From("1920x1080")).AsString();
-        Resolution = ParseResolution(resStr, new Vector2I(1920, 1080));
-
-        var customResStr = cfg.GetValue("display_settings", "custom_resolutions", Variant.From("")).AsString();
-        if (!string.IsNullOrWhiteSpace(customResStr))
-        {
-            foreach (var part in customResStr.Split(','))
-            {
-                var r = ParseResolution(part.Trim(), Vector2I.Zero);
-                if (r != Vector2I.Zero)
-                    _customResolutions.Add(r);
-            }
-        }
-
-        ApplyDisplaySettings();
-
-        // --- gameplay_settings ---
-        GamepadDeadzone = (float)cfg.GetValue("gameplay_settings", "gamepad_deadzone", Variant.From(0.2)).AsDouble();
-        GamepadSensitivity = (float)cfg.GetValue("gameplay_settings", "gamepad_sensitivity", Variant.From(1.0)).AsDouble();
-
-        ApplyGamepadDeadzone();
-
-        // --- input_settings ---
-        ApplyInputBindings(cfg);
-    }
-
-    public override void _ExitTree()
-    {
-        if (Instance == this) Instance = null;
-    }
-
-    // ── public API ───────────────────────────────────────────────────────────
-
-    public List<Vector2I> GetAllResolutions()
-    {
-        var all = new List<Vector2I>(CuratedResolutions);
-        all.AddRange(_customResolutions);
-        return all;
-    }
-
-    public void SaveDisplaySettings()
-    {
-        var cfg = ConfigFileHandler.Instance.SettingsConfig;
-        cfg.SetValue("display_settings", "window_mode", WindowMode);
-        cfg.SetValue("display_settings", "resolution", $"{Resolution.X}x{Resolution.Y}");
-        cfg.SetValue("display_settings", "custom_resolutions", BuildCustomResolutionsString());
-        cfg.Save(ConfigFileHandler.SettingsPath);
-    }
-
-    public void SaveGameplaySettings()
-    {
-        var cfg = ConfigFileHandler.Instance.SettingsConfig;
-        cfg.SetValue("gameplay_settings", "gamepad_deadzone", (double)GamepadDeadzone);
-        cfg.SetValue("gameplay_settings", "gamepad_sensitivity", (double)GamepadSensitivity);
-        cfg.Save(ConfigFileHandler.SettingsPath);
-    }
-
-    public void SaveInputSettings()
-    {
-        var cfg = ConfigFileHandler.Instance.SettingsConfig;
-        foreach (var action in InputMap.GetActions())
-        {
-            if (action.ToString().StartsWith("ui_")) continue;
-            foreach (var ev in InputMap.ActionGetEvents(action))
-            {
-                if (ev is InputEventKey key)
-                {
-                    cfg.SetValue("input_settings", action, (long)key.PhysicalKeycode);
-                    break;
-                }
-            }
-        }
-        cfg.Save(ConfigFileHandler.SettingsPath);
-    }
-
-    // ── apply helpers ────────────────────────────────────────────────────────
-
-    public void ApplyDisplaySettings()
-    {
-        switch (WindowMode)
-        {
-            case "fullscreen":
-                DisplayServer.WindowSetMode(DisplayServer.WindowMode.Fullscreen);
-                break;
-            case "borderless":
-                DisplayServer.WindowSetMode(DisplayServer.WindowMode.Windowed);
-                DisplayServer.WindowSetFlag(DisplayServer.WindowFlags.Borderless, true);
-                DisplayServer.WindowSetSize(Resolution);
-                break;
-            default: // "windowed"
-                DisplayServer.WindowSetMode(DisplayServer.WindowMode.Windowed);
-                DisplayServer.WindowSetFlag(DisplayServer.WindowFlags.Borderless, false);
-                DisplayServer.WindowSetSize(Resolution);
-                break;
-        }
-    }
-
-    public void ApplyGamepadDeadzone()
-    {
-        foreach (var action in DeadzoneActions)
-        {
-            if (InputMap.HasAction(action))
-                InputMap.ActionSetDeadzone(action, GamepadDeadzone);
-        }
-    }
-
-    private static void ApplyInputBindings(ConfigFile cfg)
-    {
-        if (!cfg.HasSection("input_settings")) return;
-
-        foreach (var actionName in cfg.GetSectionKeys("input_settings"))
-        {
-            if (actionName.StartsWith("ui_")) continue;
-            if (!InputMap.HasAction(actionName)) continue;
-
-            var scancode = (Key)(long)cfg.GetValue("input_settings", actionName);
-
-            // Remove existing keyboard events for this action
-            var events = InputMap.ActionGetEvents(actionName);
-            foreach (var ev in events)
-            {
-                if (ev is InputEventKey)
-                    InputMap.ActionEraseEvent(actionName, ev);
-            }
-
-            // Add the saved key
-            var newKey = new InputEventKey { PhysicalKeycode = scancode };
-            InputMap.ActionAddEvent(actionName, newKey);
-        }
-    }
-
-    // ── util ─────────────────────────────────────────────────────────────────
-
-    private static Vector2I ParseResolution(string s, Vector2I fallback)
-    {
-        var parts = s.Split('x');
-        if (parts.Length == 2 && int.TryParse(parts[0], out var w) && int.TryParse(parts[1], out var h))
-            return new Vector2I(w, h);
-        return fallback;
-    }
-
-    private string BuildCustomResolutionsString()
-    {
-        var parts = new List<string>();
-        foreach (var r in _customResolutions)
-            parts.Add($"{r.X}x{r.Y}");
-        return string.Join(",", parts);
-    }
-}

Autoloads/SettingsManager.cs.uid

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

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;
@@ -10,15 +11,13 @@ namespace Mr.BrickAdventures.Autoloads;
 
 public partial class SkillManager : Node
 {
+    private GameManager _gameManager;
     private PlayerController _player;
-    private GameStateStore Store => GameStateStore.Instance;
 
     [Export] public Array<SkillData> AvailableSkills { get; set; } = [];
 
     public Dictionary ActiveComponents { get; private set; } = new();
 
-    public static SkillManager Instance { get; private set; }
-
     [Signal]
     public delegate void ActiveThrowSkillChangedEventHandler(BrickThrowComponent throwComponent);
     [Signal]
@@ -26,12 +25,7 @@ public partial class SkillManager : Node
 
     public override void _Ready()
     {
-        Instance = this;
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
-    }
-
-    public override void _ExitTree()
-    {
-        if (Instance == this) Instance = null;
     }
 
     /// <summary>
@@ -83,11 +77,21 @@ public partial class SkillManager : Node
 
         if (skillData.Type == SkillType.Throw)
         {
-            // Remove any other active throw skill before adding the new one
+            var unlocked = _gameManager.GetUnlockedSkills();
-            foreach (var sd in AvailableSkills)
+            foreach (var sd in unlocked)
             {
-                if (sd != skillData && sd.Type == SkillType.Throw)
+                SkillData data = null;
-                    RemoveSkill(sd.Name);
+                foreach (var s in AvailableSkills)
+                {
+                    if (s == sd)
+                    {
+                        data = s;
+                        break;
+                    }
+                }
+                // Remove other throw skills if a new one is added
+                if (data is { Type: SkillType.Throw })
+                    RemoveSkill(data.Name);
             }
         }
 
@@ -134,6 +138,15 @@ public partial class SkillManager : Node
         if (IsInstanceValid(inst))
             inst.QueueFree();
 
+        var skills = _gameManager.GetUnlockedSkills();
+        foreach (var s in skills)
+        {
+            if (s.Name == skillName)
+            {
+                s.IsActive = false;
+                break;
+            }
+        }
         ActiveComponents.Remove(skillName);
         var sd = GetSkillByName(skillName);
         if (sd != null) EmitSignalSkillRemoved(sd);
@@ -154,14 +167,17 @@ public partial class SkillManager : Node
     public void ApplyUnlockedSkills()
     {
         if (_player == null || !IsInstanceValid(_player)) return;
-        if (Store == null) return;
 
         foreach (var sd in AvailableSkills)
         {
-            if (Store.IsSkillUnlocked(sd))
+            if (_gameManager.IsSkillUnlocked(sd))
+            {
                 CallDeferred(MethodName.AddSkill, sd);
+            }
             else
+            {
                 RemoveSkill(sd.Name);
+            }
         }
     }
 
@@ -172,16 +188,12 @@ public partial class SkillManager : Node
         return null;
     }
 
-    public bool IsSkillActive(SkillData skill)
-    {
-        return skill != null && ActiveComponents.ContainsKey(skill.Name);
-    }
-
     public void ActivateSkill(SkillData skill)
     {
         if (!ActiveComponents.ContainsKey(skill.Name))
         {
             AddSkill(skill);
+            skill.IsActive = true;
         }
     }
 
@@ -190,6 +202,7 @@ public partial class SkillManager : Node
         if (ActiveComponents.ContainsKey(skill.Name))
         {
             RemoveSkill(skill.Name);
+            skill.IsActive = false;
         }
     }
 

Autoloads/SpeedRunManager.cs

@@ -5,13 +5,9 @@ namespace Mr.BrickAdventures.Autoloads;
 
 public partial class SpeedRunManager : Node
 {
-    public static SpeedRunManager Instance { get; private set; }
-
-    public override void _EnterTree() => Instance = this;
-    public override void _ExitTree() { if (Instance == this) Instance = null; }
-
     public bool IsRunning { get; private set; } = false;
-
+    public bool IsVisible { get; private set; } = false;
+    
     private double _startTime;
     private double _levelStartTime;
     private List<double> _splits = [];
@@ -20,7 +16,7 @@ public partial class SpeedRunManager : Node
 
     public override void _Process(double delta)
     {
-        if (!IsRunning) return;
+        if (!IsRunning || !IsVisible) return;
         
         EmitSignalTimeUpdated(GetCurrentTotalTime(), GetCurrentLevelTime());
     }

Autoloads/StatisticsManager.cs

@@ -0,0 +1,62 @@
+using System.Collections.Generic;
+using Godot;
+using Mr.BrickAdventures.scripts.State;
+
+namespace Mr.BrickAdventures.Autoloads;
+
+/// <summary>
+/// Manages game statistics using GameStateStore.
+/// </summary>
+public partial class StatisticsManager : Node
+{
+
+    /// <summary>
+    /// Gets the statistics dictionary from the store.
+    /// </summary>
+    private Dictionary<string, int> GetStats()
+    {
+        return GameStateStore.Instance?.Player.Statistics ?? new Dictionary<string, int>();
+    }
+
+    /// <summary>
+    /// Increases a numerical statistic by a given amount.
+    /// </summary>
+    public void IncrementStat(string statName, int amount = 1)
+    {
+        var stats = GetStats();
+        if (stats.TryGetValue(statName, out var currentValue))
+        {
+            stats[statName] = currentValue + amount;
+        }
+        else
+        {
+            stats[statName] = amount;
+        }
+    }
+
+    /// <summary>
+    /// Sets a statistic to a specific value.
+    /// </summary>
+    public void SetStat(string statName, int value)
+    {
+        var stats = GetStats();
+        stats[statName] = value;
+    }
+
+    /// <summary>
+    /// Gets the value of a statistic.
+    /// </summary>
+    public int GetStat(string statName)
+    {
+        var stats = GetStats();
+        return stats.TryGetValue(statName, out var value) ? value : 0;
+    }
+
+    /// <summary>
+    /// Gets a copy of all statistics.
+    /// </summary>
+    public Dictionary<string, int> GetAllStats()
+    {
+        return new Dictionary<string, int>(GetStats());
+    }
+}

Autoloads/StatisticsManager.cs.uid

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

Autoloads/UIManager.cs

@@ -1,22 +1,11 @@
 using Godot;
+using Godot.Collections;
 
 namespace Mr.BrickAdventures.Autoloads;
 
 public partial class UIManager : Node
 {
-    public static UIManager Instance { get; private set; }
+    [Export] public Array<Control> UiStack { get; set; } = new();
-
-    private readonly System.Collections.Generic.List<Control> UiStack = new();
-
-    public override void _Ready()
-    {
-        Instance = this;
-    }
-
-    public override void _ExitTree()
-    {
-        if (Instance == this) Instance = null;
-    }
     
     [Signal] public delegate void ScreenPushedEventHandler(Control screen);
     [Signal] public delegate void ScreenPoppedEventHandler(Control screen);
@@ -45,19 +34,19 @@ public partial class UIManager : Node
             return;
         }
         
-        var top = UiStack[^1];
+        var top = (Control)UiStack[^1];
         UiStack.RemoveAt(UiStack.Count - 1);
         top.Hide();
         top.SetProcessInput(false);
         EmitSignalScreenPopped(top);
         top.AcceptEvent();
 
-        if (UiStack.Count > 0) UiStack[^1].GrabFocus();
+        if (UiStack.Count > 0) ((Control)UiStack[^1]).GrabFocus();
     }
     
-    public Control TopScreen() => UiStack.Count > 0 ? UiStack[^1] : null;
+    public Control TopScreen() => UiStack.Count > 0 ? (Control)UiStack[^1] : null;
-
+    
-    public bool IsScreenOnTop(Control screen) => UiStack.Count > 0 && UiStack[^1] == screen;
+    public bool IsScreenOnTop(Control screen) => UiStack.Count > 0 && (Control)UiStack[^1] == screen;
     
     public bool IsVisibleOnStack(Control screen) => UiStack.Contains(screen) && screen.Visible;
     

Mr. Brick Adventures.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/4.6.1">
+<Project Sdk="Godot.NET.Sdk/4.5.1">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>

objects/entities/big_coin.tscn

@@ -1,4 +1,4 @@
-[gd_scene format=3 uid="uid://bargnp4twtmxg"]
+[gd_scene load_steps=7 format=3 uid="uid://bargnp4twtmxg"]
 
 [ext_resource type="Texture2D" uid="uid://djifxc5x0dyrw" path="res://sprites/ppc_tileset.png" id="1_aya2w"]
 [ext_resource type="Script" uid="uid://r4jybneigfcn" path="res://scripts/components/CollectableComponent.cs" id="2_htmrw"]
@@ -9,33 +9,33 @@
 [sub_resource type="CircleShape2D" id="CircleShape2D_3ask2"]
 radius = 9.0
 
-[node name="Big Coin" type="Area2D" unique_id=354254828 groups=["coins"]]
+[node name="Big Coin" type="Area2D" groups=["coins"]]
 scale = Vector2(2, 2)
 collision_layer = 2
 collision_mask = 4
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=2066526597]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource("CircleShape2D_3ask2")
 
-[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1626463721]
+[node name="Sprite2D" type="Sprite2D" parent="."]
 texture = ExtResource("1_aya2w")
 hframes = 12
 vframes = 12
 frame = 51
 
-[node name="CollectableComponent" type="Node" parent="." unique_id=1124310030 node_paths=PackedStringArray("Area2D", "CollisionShape", "Sfx")]
+[node name="CollectableComponent" type="Node" parent="." node_paths=PackedStringArray("Area2D", "CollisionShape", "Sfx")]
 script = ExtResource("2_htmrw")
 Area2D = NodePath("..")
 CollisionShape = NodePath("../CollisionShape2D")
 Data = ExtResource("3_lk3av")
 Sfx = NodePath("../sfx")
 
-[node name="FadeAwayComponent" type="Node" parent="." unique_id=222617739 node_paths=PackedStringArray("Sprite", "Area")]
+[node name="FadeAwayComponent" type="Node" parent="." node_paths=PackedStringArray("Sprite", "Area")]
 script = ExtResource("4_62p7g")
 Sprite = NodePath("../Sprite2D")
 Area = NodePath("..")
 
-[node name="sfx" type="AudioStreamPlayer2D" parent="." unique_id=1978747299]
+[node name="sfx" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("5_dbffd")
 volume_db = -5.0
 bus = &"sfx"

objects/entities/big_treasure.tscn

@@ -1,4 +1,4 @@
-[gd_scene format=3 uid="uid://d08dfqmirnd66"]
+[gd_scene load_steps=7 format=3 uid="uid://d08dfqmirnd66"]
 
 [ext_resource type="Texture2D" uid="uid://djifxc5x0dyrw" path="res://sprites/ppc_tileset.png" id="1_1co1x"]
 [ext_resource type="Script" uid="uid://r4jybneigfcn" path="res://scripts/components/CollectableComponent.cs" id="2_lthbn"]
@@ -9,32 +9,32 @@
 [sub_resource type="CircleShape2D" id="CircleShape2D_3ask2"]
 radius = 9.0
 
-[node name="Big Treasure" type="Area2D" unique_id=1021217632 groups=["coins"]]
+[node name="Big Treasure" type="Area2D" groups=["coins"]]
 collision_layer = 2
 collision_mask = 4
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=458290011]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource("CircleShape2D_3ask2")
 
-[node name="Sprite2D" type="Sprite2D" parent="." unique_id=564060301]
+[node name="Sprite2D" type="Sprite2D" parent="."]
 texture = ExtResource("1_1co1x")
 hframes = 12
 vframes = 12
 frame = 64
 
-[node name="CollectableComponent" type="Node" parent="." unique_id=2009195182 node_paths=PackedStringArray("Area2D", "CollisionShape", "Sfx")]
+[node name="CollectableComponent" type="Node" parent="." node_paths=PackedStringArray("Area2D", "CollisionShape", "Sfx")]
 script = ExtResource("2_lthbn")
 Area2D = NodePath("..")
 CollisionShape = NodePath("../CollisionShape2D")
 Data = ExtResource("3_k64cr")
 Sfx = NodePath("../sfx")
 
-[node name="FadeAwayComponent" type="Node" parent="." unique_id=1809580000 node_paths=PackedStringArray("Sprite", "Area")]
+[node name="FadeAwayComponent" type="Node" parent="." node_paths=PackedStringArray("Sprite", "Area")]
 script = ExtResource("4_qwwsj")
 Sprite = NodePath("../Sprite2D")
 FadeDuration = 0.4
 Area = NodePath("..")
 
-[node name="sfx" type="AudioStreamPlayer2D" parent="." unique_id=466669009]
+[node name="sfx" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("5_fxf8v")
 bus = &"sfx"

objects/entities/brick_player.tscn

@@ -1,12 +1,22 @@
-[gd_scene format=3 uid="uid://bqi5s710xb1ju"]
+[gd_scene load_steps=57 format=3 uid="uid://bqi5s710xb1ju"]
 
 [ext_resource type="Script" uid="uid://csel4s0e4g5uf" path="res://scripts/components/PlayerController.cs" id="1_yysbb"]
-[ext_resource type="Resource" uid="uid://vgutbpovj8hc" path="res://resources/movement_presets/platform_movement.tres" id="2_7til7"]
 [ext_resource type="Shader" uid="uid://bs4xvm4qkurpr" path="res://shaders/hit_flash.tres" id="2_lgb3u"]
+[ext_resource type="PackedScene" uid="uid://bcv8kx6bc7u5e" path="res://objects/movement_abilities/ground_ability.tscn" id="2_oefns"]
 [ext_resource type="Texture2D" uid="uid://jl1gwqchhpdc" path="res://sprites/left_eye.png" id="3_2srrh"]
+[ext_resource type="PackedScene" uid="uid://d0r5edxnx5jqx" path="res://objects/movement_abilities/variable_jump_ability.tscn" id="3_bnap0"]
+[ext_resource type="Script" uid="uid://bf4yclropol43" path="res://scripts/components/Movement/GroundMovementAbility.cs" id="4_7til7"]
 [ext_resource type="Texture2D" uid="uid://iiawtnwmeny3" path="res://sprites/right_eye.png" id="4_ccn81"]
+[ext_resource type="PackedScene" uid="uid://cala7bpo1v4no" path="res://objects/movement_abilities/gravity_ability.tscn" id="4_qec3q"]
+[ext_resource type="PackedScene" uid="uid://bty3jq8u0pxkf" path="res://objects/movement_abilities/one_way_platform_ability.tscn" id="5_dhjci"]
 [ext_resource type="Texture2D" uid="uid://0l454rfplmqg" path="res://sprites/MrBrick_base-sheet.png" id="5_yysbb"]
+[ext_resource type="PackedScene" uid="uid://bu3vuxlrvoo1t" path="res://objects/movement_abilities/spaceship_ability.tscn" id="6_721q0"]
+[ext_resource type="Script" uid="uid://chgw53qwt7rt8" path="res://scripts/components/Movement/GravityAbility.cs" id="6_xuhvf"]
+[ext_resource type="Script" uid="uid://ccksp2e76s7sr" path="res://scripts/components/Movement/VariableJumpAbility.cs" id="7_bl1gx"]
+[ext_resource type="PackedScene" uid="uid://chjbi5mgtwhsh" path="res://objects/movement_abilities/wall_jump_ability.tscn" id="7_bnap0"]
+[ext_resource type="Script" uid="uid://ck6kmnbwhsttt" path="res://scripts/components/Movement/OneWayPlatformAbility.cs" id="7_uno3u"]
 [ext_resource type="Texture2D" uid="uid://dhkwyv6ayb5qb" path="res://sprites/flying_ship.png" id="8_6lsog"]
+[ext_resource type="PackedScene" uid="uid://dre1vit1m4d2n" path="res://objects/movement_abilities/grid_movement_ability.tscn" id="8_xuhvf"]
 [ext_resource type="Script" uid="uid://dy78ak8eykw6e" path="res://scripts/components/FlipComponent.cs" id="9_yysbb"]
 [ext_resource type="Script" uid="uid://mnjg3p0aw1ow" path="res://scripts/components/CanPickUpComponent.cs" id="10_yysbb"]
 [ext_resource type="Script" uid="uid://dgb8bqcri7nsj" path="res://scripts/components/HealthComponent.cs" id="12_ur2y5"]
@@ -65,7 +75,7 @@ point_count = 2
 [sub_resource type="CurveTexture" id="CurveTexture_xoue7"]
 curve = SubResource("Curve_82d6e")
 
-[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_oxudy"]
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_lgb3u"]
 resource_local_to_scene = true
 lifetime_randomness = 1.0
 particle_flag_disable_z = true
@@ -82,202 +92,227 @@ scale_curve = SubResource("CurveTexture_xoue7")
 color = Color(0.764706, 0.443137, 0, 1)
 color_ramp = SubResource("GradientTexture1D_lgb3u")
 
-[node name="Brick Player" type="CharacterBody2D" unique_id=634211282 node_paths=PackedStringArray("MovementAbilitiesContainer") groups=["player"]]
+[node name="Brick Player" type="CharacterBody2D" node_paths=PackedStringArray("MovementAbilitiesContainer") groups=["player"]]
 collision_layer = 4
 collision_mask = 107
 script = ExtResource("1_yysbb")
 MovementAbilitiesContainer = NodePath("Movements")
-DefaultPreset = ExtResource("2_7til7")
+GroundMovementScene = ExtResource("2_oefns")
+JumpMovementScene = ExtResource("3_bnap0")
+GravityScene = ExtResource("4_qec3q")
+OneWayPlatformScene = ExtResource("5_dhjci")
+SpaceshipMovementScene = ExtResource("6_721q0")
+WallJumpScene = ExtResource("7_bnap0")
+GridMovementScene = ExtResource("8_xuhvf")
 metadata/_custom_type_script = "uid://csel4s0e4g5uf"
 
-[node name="Movements" type="Node" parent="." unique_id=1545001]
+[node name="Movements" type="Node" parent="."]
 
-[node name="Graphics" type="Node2D" parent="." unique_id=271317654]
+[node name="GroundMovementAbility" type="Node" parent="Movements"]
+script = ExtResource("4_7til7")
+MaxSpeed = 376.0
+Friction = 2500.0
+metadata/_custom_type_script = "uid://bf4yclropol43"
 
-[node name="Root" type="Node2D" parent="Graphics" unique_id=2012260442]
+[node name="GravityAbility" type="Node" parent="Movements"]
+script = ExtResource("6_xuhvf")
+metadata/_custom_type_script = "uid://chgw53qwt7rt8"
 
-[node name="Base" type="Sprite2D" parent="Graphics/Root" unique_id=1178176210]
+[node name="VariableJumpAbility" type="Node" parent="Movements"]
+script = ExtResource("7_bl1gx")
+JumpCutMultiplier = 0.507
+metadata/_custom_type_script = "uid://ccksp2e76s7sr"
+
+[node name="OneWayPlatformAbility" type="Node" parent="Movements"]
+script = ExtResource("7_uno3u")
+metadata/_custom_type_script = "uid://ck6kmnbwhsttt"
+
+[node name="Graphics" type="Node2D" parent="."]
+
+[node name="Root" type="Node2D" parent="Graphics"]
+
+[node name="Base" type="Sprite2D" parent="Graphics/Root"]
 material = SubResource("ShaderMaterial_xoue7")
 texture = ExtResource("5_yysbb")
 hframes = 5
 
-[node name="Left Eye" type="Sprite2D" parent="Graphics/Root" unique_id=653633051]
+[node name="Left Eye" type="Sprite2D" parent="Graphics/Root"]
 position = Vector2(-7, -6)
 texture = ExtResource("3_2srrh")
 hframes = 2
 
-[node name="Right Eye" type="Sprite2D" parent="Graphics/Root" unique_id=721230787]
+[node name="Right Eye" type="Sprite2D" parent="Graphics/Root"]
 position = Vector2(6, -5)
 texture = ExtResource("4_ccn81")
 hframes = 2
 
-[node name="Ship" type="Sprite2D" parent="Graphics" unique_id=1074443059]
+[node name="Ship" type="Sprite2D" parent="Graphics"]
 visible = false
 position = Vector2(1, 7)
 texture = ExtResource("8_6lsog")
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=22428429]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 visible = false
 position = Vector2(0, 0.5)
 shape = SubResource("RectangleShape2D_hdsg1")
 
-[node name="FlipPlayerComponent" type="Node2D" parent="." unique_id=290535881 node_paths=PackedStringArray("LeftEye", "RightEye", "PlayerController")]
+[node name="FlipPlayerComponent" type="Node2D" parent="." node_paths=PackedStringArray("LeftEye", "RightEye", "PlayerController")]
 script = ExtResource("9_yysbb")
 LeftEye = NodePath("../Graphics/Root/Left Eye")
 RightEye = NodePath("../Graphics/Root/Right Eye")
 PlayerController = NodePath("..")
 
-[node name="StompDamageArea" type="Area2D" parent="." unique_id=2071262827]
+[node name="StompDamageArea" type="Area2D" parent="."]
 collision_layer = 0
 collision_mask = 8
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="StompDamageArea" unique_id=1230518642]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="StompDamageArea"]
 visible = false
 position = Vector2(0, 1)
 shape = SubResource("RectangleShape2D_vad0t")
 
-[node name="CanPickUpComponent" type="Node" parent="." unique_id=1912343790]
+[node name="CanPickUpComponent" type="Node" parent="."]
 script = ExtResource("10_yysbb")
 
-[node name="HealthComponent" type="Node2D" parent="." unique_id=278902432 node_paths=PackedStringArray("HurtSfx", "HealSfx")]
+[node name="HealthComponent" type="Node2D" parent="." node_paths=PackedStringArray("HurtSfx", "HealSfx")]
 script = ExtResource("12_ur2y5")
 HurtSfx = NodePath("../sfx_hurt")
 HealSfx = NodePath("../sfx_heal")
 
-[node name="PlayerDeathComponent" type="Node2D" parent="." unique_id=1989490803 node_paths=PackedStringArray("DeathSfx", "HealthComponent")]
+[node name="PlayerDeathComponent" type="Node2D" parent="." node_paths=PackedStringArray("DeathSfx", "HealthComponent")]
 process_mode = 3
 script = ExtResource("13_7til7")
 DeathSfx = NodePath("../sfx_hurt")
 HealthComponent = NodePath("../HealthComponent")
 
-[node name="InvulnerabilityComponent" type="Node" parent="." unique_id=963173254 node_paths=PackedStringArray("FlashingComponent")]
+[node name="InvulnerabilityComponent" type="Node" parent="." node_paths=PackedStringArray("FlashingComponent")]
 script = ExtResource("15_xuhvf")
 FlashingComponent = NodePath("../FlashingComponent Base")
 
-[node name="FlashingComponent Base" type="Node" parent="." unique_id=533766453 node_paths=PackedStringArray("Sprite", "HealthComponent")]
+[node name="FlashingComponent Base" type="Node" parent="." node_paths=PackedStringArray("Sprite", "HealthComponent")]
 script = ExtResource("16_uno3u")
 Sprite = NodePath("../Graphics/Root/Base")
 FlashDuration = 1.0
 HealthComponent = NodePath("../HealthComponent")
 
-[node name="FlashingComponent LEye" type="Node" parent="." unique_id=835038717 node_paths=PackedStringArray("Sprite", "HealthComponent")]
+[node name="FlashingComponent LEye" type="Node" parent="." node_paths=PackedStringArray("Sprite", "HealthComponent")]
 script = ExtResource("16_uno3u")
 Sprite = NodePath("../Graphics/Root/Left Eye")
 FlashDuration = 1.0
 HealthComponent = NodePath("../HealthComponent")
 
-[node name="FlashingComponent REye" type="Node" parent="." unique_id=601265429 node_paths=PackedStringArray("Sprite", "HealthComponent")]
+[node name="FlashingComponent REye" type="Node" parent="." node_paths=PackedStringArray("Sprite", "HealthComponent")]
 script = ExtResource("16_uno3u")
 Sprite = NodePath("../Graphics/Root/Right Eye")
 FlashDuration = 1.0
 HealthComponent = NodePath("../HealthComponent")
 
-[node name="StompDamageComponent" type="Node" parent="." unique_id=1027107459 node_paths=PackedStringArray("Area", "Root")]
+[node name="StompDamageComponent" type="Node" parent="." node_paths=PackedStringArray("Area", "Root")]
 script = ExtResource("17_bl1gx")
 Damage = 4.0
 Area = NodePath("../StompDamageArea")
 Root = NodePath("..")
 
-[node name="SkillUnlockerComponent" type="Node" parent="." unique_id=496647555]
+[node name="SkillUnlockerComponent" type="Node" parent="."]
 script = ExtResource("25_yysbb")
 
-[node name="HitComponent" type="Node" parent="." unique_id=131916578 node_paths=PackedStringArray("Sprite", "Health", "HitFx")]
+[node name="HitComponent" type="Node" parent="." node_paths=PackedStringArray("Sprite", "Health", "HitFx")]
 script = ExtResource("26_6n1ss")
 Sprite = NodePath("../Graphics/Root/Base")
 Health = NodePath("../HealthComponent")
 HitFx = NodePath("../HitParticles")
 
-[node name="MagneticArea" type="Area2D" parent="." unique_id=1477305842]
+[node name="MagneticArea" type="Area2D" parent="."]
 collision_layer = 0
 collision_mask = 2
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="MagneticArea" unique_id=1552683633]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="MagneticArea"]
 visible = false
 shape = SubResource("CircleShape2D_ps31c")
 
-[node name="CanBeLaunchedComponent" type="Node" parent="." unique_id=1998429478]
+[node name="CanBeLaunchedComponent" type="Node" parent="."]
 script = ExtResource("27_oefns")
 
-[node name="TriggerLeverComponent" type="Node" parent="." unique_id=366225548]
+[node name="TriggerLeverComponent" type="Node" parent="."]
 script = ExtResource("28_bnap0")
 
-[node name="sfx_jump" type="AudioStreamPlayer2D" parent="." unique_id=218072388]
+[node name="sfx_jump" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("18_pysae")
 bus = &"sfx"
 
-[node name="sfx_hurt" type="AudioStreamPlayer2D" parent="." unique_id=1815263121]
+[node name="sfx_hurt" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("19_7anly")
 bus = &"sfx"
 
-[node name="sfx_heal" type="AudioStreamPlayer2D" parent="." unique_id=1792916109]
+[node name="sfx_heal" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("20_bptj5")
 bus = &"sfx"
 
-[node name="sfx_shoot" type="AudioStreamPlayer2D" parent="." unique_id=1414786458]
+[node name="sfx_shoot" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("32_x2b7c")
 bus = &"sfx"
 
-[node name="ChargingBarLayer" parent="." unique_id=664675361 instance=ExtResource("28_3f5nm")]
+[node name="ChargingBarLayer" parent="." instance=ExtResource("28_3f5nm")]
 offset_left = -17.0
 offset_top = -30.0
 offset_right = 23.0
 offset_bottom = -20.0
 
-[node name="HitParticles" parent="." unique_id=1322585720 instance=ExtResource("28_jh5m0")]
+[node name="HitParticles" parent="." instance=ExtResource("28_jh5m0")]
-process_material = SubResource("ParticleProcessMaterial_oxudy")
+process_material = SubResource("ParticleProcessMaterial_lgb3u")
 
-[node name="ShipShooter" type="Node" parent="." unique_id=1147013800 node_paths=PackedStringArray("BulletSpawn", "ShootSfx")]
+[node name="ShipShooter" type="Node" parent="." node_paths=PackedStringArray("BulletSpawn", "ShootSfx")]
 script = ExtResource("30_usc1p")
 BulletScene = ExtResource("36_oxudy")
 BulletSpawn = NodePath("../Ship shoot spawn")
 ShootSfx = NodePath("../sfx_shoot")
 
-[node name="Ship shoot spawn" type="Marker2D" parent="." unique_id=1653596970]
+[node name="Ship shoot spawn" type="Marker2D" parent="."]
 position = Vector2(17, 5)
 gizmo_extents = 1.0
 
-[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="." unique_id=65174812]
+[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."]
 position = Vector2(0, 3)
 scale = Vector2(0.8, 1.9)
 
-[node name="PlayerInputHandler" type="Node" parent="." unique_id=1581385683]
+[node name="PlayerInputHandler" type="Node" parent="."]
 script = ExtResource("42_e5pae")
 metadata/_custom_type_script = "uid://dssa2taiwktis"
 
-[node name="SpriteTilterComponent" type="Node" parent="." unique_id=1433925210 node_paths=PackedStringArray("RotationTarget")]
+[node name="SpriteTilterComponent" type="Node" parent="." node_paths=PackedStringArray("RotationTarget")]
 script = ExtResource("43_xuhvf")
 RotationTarget = NodePath("../Graphics/Root/Base")
 metadata/_custom_type_script = "uid://ceoxet1nqws8w"
 
-[node name="PlayerSfxComponent" type="Node" parent="." unique_id=1375936690 node_paths=PackedStringArray("JumpSfx")]
+[node name="PlayerSfxComponent" type="Node" parent="." node_paths=PackedStringArray("JumpSfx")]
 script = ExtResource("49_qec3q")
 JumpSfx = NodePath("../sfx_jump")
 metadata/_custom_type_script = "uid://b1h8r5irryxcx"
 
-[node name="PlayerGraphicsComponent" type="Node" parent="." unique_id=443649347 node_paths=PackedStringArray("DefaultSprite", "SpaceshipSprite")]
+[node name="PlayerGraphicsComponent" type="Node" parent="." node_paths=PackedStringArray("DefaultSprite", "SpaceshipSprite")]
 script = ExtResource("50_dhjci")
 DefaultSprite = NodePath("../Graphics/Root")
 SpaceshipSprite = NodePath("../Graphics/Ship")
 metadata/_custom_type_script = "uid://b2aanqykvdnev"
 
-[node name="ProgressiveDamageComponent" type="Node" parent="." unique_id=1763641730 node_paths=PackedStringArray("HealthComponent", "Sprite")]
+[node name="ProgressiveDamageComponent" type="Node" parent="." node_paths=PackedStringArray("HealthComponent", "Sprite")]
 script = ExtResource("38_dhjci")
 HealthComponent = NodePath("../HealthComponent")
 Sprite = NodePath("../Graphics/Root/Base")
 metadata/_custom_type_script = "uid://dupnaark1f7gm"
 
-[node name="PacXonGridInteractor" type="Node" parent="." unique_id=1036082136]
+[node name="PacXonGridInteractor" type="Node" parent="."]
 script = ExtResource("42_xuhvf")
 metadata/_custom_type_script = "uid://c00siqtssccr6"
 
-[node name="PacXonTrailComponent" type="Line2D" parent="." unique_id=100969687]
+[node name="PacXonTrailComponent" type="Line2D" parent="."]
 script = ExtResource("44_uno3u")
 metadata/_custom_type_script = "uid://cmk4m7mplqnrm"
 
-[node name="Feet" type="Marker2D" parent="." unique_id=1308840991]
+[node name="Feet" type="Marker2D" parent="."]
 position = Vector2(0, 16)
 
-[node name="FootstepGfx" type="Node2D" parent="." unique_id=362059837 node_paths=PackedStringArray("_controller", "_marker")]
+[node name="FootstepGfx" type="Node2D" parent="." node_paths=PackedStringArray("_controller", "_marker")]
 script = ExtResource("46_6n1ss")
 _particles = ExtResource("45_bl1gx")
 _controller = NodePath("..")
@@ -288,7 +323,7 @@ _minMoveSpeed = 4.0
 _randomOffsetRange = 0.3
 metadata/_custom_type_script = "uid://d3ksrjt1ek4gi"
 
-[node name="JumpGfxComponent" type="Node2D" parent="." unique_id=1468920790 node_paths=PackedStringArray("Controller")]
+[node name="JumpGfxComponent" type="Node2D" parent="." node_paths=PackedStringArray("Controller")]
 script = ExtResource("47_oefns")
 ParticleScene = ExtResource("48_bnap0")
 Controller = NodePath("..")

objects/entities/coin.tscn

@@ -1,4 +1,4 @@
-[gd_scene format=3 uid="uid://54w4wisfj8v8"]
+[gd_scene load_steps=7 format=3 uid="uid://54w4wisfj8v8"]
 
 [ext_resource type="Texture2D" uid="uid://djifxc5x0dyrw" path="res://sprites/ppc_tileset.png" id="1_epuj5"]
 [ext_resource type="Script" uid="uid://r4jybneigfcn" path="res://scripts/components/CollectableComponent.cs" id="2_gxix7"]
@@ -9,33 +9,33 @@
 [sub_resource type="CircleShape2D" id="CircleShape2D_3ask2"]
 radius = 9.0
 
-[node name="Coin" type="Area2D" unique_id=1771447403 groups=["coins"]]
+[node name="Coin" type="Area2D" groups=["coins"]]
 collision_layer = 2
 collision_mask = 4
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=707378099]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource("CircleShape2D_3ask2")
 
-[node name="Sprite2D" type="Sprite2D" parent="." unique_id=898624458]
+[node name="Sprite2D" type="Sprite2D" parent="."]
 texture = ExtResource("1_epuj5")
 hframes = 12
 vframes = 12
 frame = 51
 
-[node name="CollectableComponent" type="Node" parent="." unique_id=564726971 node_paths=PackedStringArray("Area2D", "CollisionShape", "Sfx")]
+[node name="CollectableComponent" type="Node" parent="." node_paths=PackedStringArray("Area2D", "CollisionShape", "Sfx")]
 script = ExtResource("2_gxix7")
 Area2D = NodePath("..")
 CollisionShape = NodePath("../CollisionShape2D")
 Data = ExtResource("3_fm2fq")
 Sfx = NodePath("../sfx")
 
-[node name="FadeAwayComponent" type="Node" parent="." unique_id=1534239994 node_paths=PackedStringArray("Sprite", "Area")]
+[node name="FadeAwayComponent" type="Node" parent="." node_paths=PackedStringArray("Sprite", "Area")]
 script = ExtResource("4_gxix7")
 Sprite = NodePath("../Sprite2D")
 FadeDuration = 0.4
 Area = NodePath("..")
 
-[node name="sfx" type="AudioStreamPlayer2D" parent="." unique_id=1641717]
+[node name="sfx" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("5_4jc2c")
 volume_db = -10.0
 bus = &"sfx"

objects/entities/double_jump_skill_pickup.tscn

@@ -1,34 +0,0 @@
-[gd_scene load_steps=6 format=3 uid="uid://dk2cu8qs7odib"]
-
-[ext_resource type="Texture2D" uid="uid://djifxc5x0dyrw" path="res://sprites/ppc_tileset.png" id="1_214vd"]
-[ext_resource type="Script" uid="uid://r4jybneigfcn" path="res://scripts/components/CollectableComponent.cs" id="2_h7fi3"]
-[ext_resource type="Script" uid="uid://bjln6jb1sigx2" path="res://scripts/components/FadeAwayComponent.cs" id="3_b687r"]
-[ext_resource type="Resource" path="res://resources/collectables/double_jump_pickup.tres" id="3_h7fi3"]
-
-[sub_resource type="CircleShape2D" id="CircleShape2D_pickup"]
-radius = 12.0
-
-[node name="SkillPickup" type="Area2D" groups=["Collectables"]]
-collision_layer = 2
-collision_mask = 4
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-shape = SubResource("CircleShape2D_pickup")
-
-[node name="Sprite2D" type="Sprite2D" parent="."]
-texture = ExtResource("1_214vd")
-hframes = 12
-vframes = 12
-frame = 24
-
-[node name="CollectableComponent" type="Node" parent="." node_paths=PackedStringArray("Area2D", "CollisionShape")]
-script = ExtResource("2_h7fi3")
-Area2D = NodePath("..")
-CollisionShape = NodePath("../CollisionShape2D")
-Data = ExtResource("3_h7fi3")
-
-[node name="FadeAwayComponent" type="Node" parent="." node_paths=PackedStringArray("Sprite", "Area")]
-script = ExtResource("3_b687r")
-Sprite = NodePath("../Sprite2D")
-FadeDuration = 0.5
-Area = NodePath("..")

objects/entities/exit_level.tscn

@@ -1,4 +1,4 @@
-[gd_scene format=3 uid="uid://12jnkdygpxwc"]
+[gd_scene load_steps=6 format=3 uid="uid://12jnkdygpxwc"]
 
 [ext_resource type="Texture2D" uid="uid://djifxc5x0dyrw" path="res://sprites/ppc_tileset.png" id="1_agxwm"]
 [ext_resource type="Script" uid="uid://dnh0mekg2vqxi" path="res://scripts/components/RequirementComponent.cs" id="2_ed7mh"]
@@ -8,14 +8,14 @@
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_yfu6m"]
 size = Vector2(28, 32)
 
-[node name="ExitLevel" type="Area2D" unique_id=1951927125 node_paths=PackedStringArray("DoorSprite")]
+[node name="ExitLevel" type="Area2D" node_paths=PackedStringArray("DoorSprite")]
 collision_layer = 0
 collision_mask = 4
 script = ExtResource("4_06sog")
 DoorSprite = NodePath("Sprite2D")
 OpenedDoorFrame = 88
 
-[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1296410089]
+[node name="Sprite2D" type="Sprite2D" parent="."]
 position = Vector2(0, -8)
 scale = Vector2(2, 2)
 texture = ExtResource("1_agxwm")
@@ -23,15 +23,15 @@ hframes = 12
 vframes = 12
 frame = 54
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=220927363]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 position = Vector2(0, -8)
 shape = SubResource("RectangleShape2D_yfu6m")
 
-[node name="RequirementComponent" type="Node" parent="." unique_id=1338124097]
+[node name="RequirementComponent" type="Node" parent="."]
 script = ExtResource("2_ed7mh")
-RequirementType = 2
+RequirementType = 1
 
-[node name="UnlockOnRequirementComponent" type="Node" parent="." unique_id=1279359200 node_paths=PackedStringArray("RequirementComponent", "UnlockTarget")]
+[node name="UnlockOnRequirementComponent" type="Node" parent="." node_paths=PackedStringArray("RequirementComponent", "UnlockTarget")]
 script = ExtResource("3_ed7mh")
 RequirementComponent = NodePath("../RequirementComponent")
 UnlockTarget = NodePath("..")

objects/entities/flying_enemy.tscn

@@ -1,4 +1,4 @@
-[gd_scene format=3 uid="uid://xp4njljog0x2"]
+[gd_scene load_steps=30 format=3 uid="uid://xp4njljog0x2"]
 
 [ext_resource type="Texture2D" uid="uid://22k1u37j6k8y" path="res://sprites/flying_enemy.png" id="1_30hhw"]
 [ext_resource type="Shader" uid="uid://bs4xvm4qkurpr" path="res://shaders/hit_flash.tres" id="1_uyhuj"]
@@ -60,7 +60,7 @@ point_count = 2
 [sub_resource type="CurveTexture" id="CurveTexture_7b7mt"]
 curve = SubResource("Curve_f2w8b")
 
-[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_q78ru"]
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_qxfb0"]
 resource_local_to_scene = true
 lifetime_randomness = 1.0
 particle_flag_disable_z = true
@@ -80,52 +80,50 @@ color_ramp = SubResource("GradientTexture1D_f1fvy")
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_cmp1h"]
 size = Vector2(16, 26)
 
-[node name="Flying Enemy" type="CharacterBody2D" unique_id=1068972930]
+[node name="Flying Enemy" type="CharacterBody2D"]
 collision_layer = 8
 collision_mask = 21
 motion_mode = 1
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=572073196]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 visible = false
 shape = SubResource("CapsuleShape2D_hil2i")
 
-[node name="Sprite2D" type="Sprite2D" parent="." unique_id=191340928]
+[node name="Sprite2D" type="Sprite2D" parent="."]
 material = SubResource("ShaderMaterial_q78ru")
 texture = ExtResource("1_30hhw")
 
-[node name="Jetpack Particles" type="GPUParticles2D" parent="." unique_id=1641064286]
+[node name="Jetpack Particles" type="GPUParticles2D" parent="."]
 z_index = -1
 position = Vector2(-4, 16)
 explosiveness = 0.5
 fixed_fps = 24
 process_material = SubResource("ParticleProcessMaterial_fd2du")
 
-[node name="Jetpack Particles2" type="GPUParticles2D" parent="." unique_id=962140317]
+[node name="Jetpack Particles2" type="GPUParticles2D" parent="."]
 z_index = -1
 position = Vector2(4, 16)
 explosiveness = 0.5
 fixed_fps = 24
 process_material = SubResource("ParticleProcessMaterial_fd2du")
 
-[node name="HealthComponent" type="Node2D" parent="." unique_id=1125679087 node_paths=PackedStringArray("HurtSfx")]
+[node name="HealthComponent" type="Node2D" parent="." node_paths=PackedStringArray("HurtSfx")]
 script = ExtResource("3_uyhuj")
-Health = 0.25
-MaxHealth = 0.25
 HurtSfx = NodePath("../sfx_hurt")
 
-[node name="sfx_hurt" type="AudioStreamPlayer2D" parent="." unique_id=1006537001]
+[node name="sfx_hurt" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("3_fd2du")
 bus = &"sfx"
 
-[node name="sfx_shoot" type="AudioStreamPlayer2D" parent="." unique_id=1437744637]
+[node name="sfx_shoot" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("4_rhq76")
 bus = &"sfx"
 
-[node name="DamageComponent" type="Node" parent="." unique_id=1923393563 node_paths=PackedStringArray("Area")]
+[node name="DamageComponent" type="Node" parent="." node_paths=PackedStringArray("Area")]
 script = ExtResource("6_q78ru")
 Area = NodePath("../Hitbox")
 
-[node name="PeriodicShootingComponent" type="Node" parent="." unique_id=1743534415 node_paths=PackedStringArray("BulletSpawnPointRight", "BulletSpawnPointLeft")]
+[node name="PeriodicShootingComponent" type="Node" parent="." node_paths=PackedStringArray("BulletSpawnPointRight", "BulletSpawnPointLeft")]
 script = ExtResource("7_weo6b")
 BulletScene = ExtResource("7_4ajjm")
 ShootInterval = 2.0
@@ -133,68 +131,68 @@ BulletSpawnPointRight = NodePath("../laser spawn point right")
 BulletSpawnPointLeft = NodePath("../laser spawn point left")
 ShootingIntervalVariation = 0.5
 
-[node name="EnemyDeathComponent" type="Node" parent="." unique_id=1519565079 node_paths=PackedStringArray("CollisionShape", "Health")]
+[node name="EnemyDeathComponent" type="Node" parent="." node_paths=PackedStringArray("CollisionShape", "Health")]
 script = ExtResource("9_6p4k7")
 TweenDuration = 0.1
 CollisionShape = NodePath("../CollisionShape2D")
 Health = NodePath("../HealthComponent")
 
-[node name="FlashingComponent" type="Node" parent="." unique_id=1761479670 node_paths=PackedStringArray("Sprite", "HealthComponent")]
+[node name="FlashingComponent" type="Node" parent="." node_paths=PackedStringArray("Sprite", "HealthComponent")]
 process_mode = 3
 script = ExtResource("10_jmybk")
 Sprite = NodePath("../Sprite2D")
 HealthComponent = NodePath("../HealthComponent")
 
-[node name="HitComponent" type="Node" parent="." unique_id=2106183592 node_paths=PackedStringArray("Sprite", "Health", "HitFx")]
+[node name="HitComponent" type="Node" parent="." node_paths=PackedStringArray("Sprite", "Health", "HitFx")]
 script = ExtResource("11_2yvae")
 Sprite = NodePath("../Sprite2D")
 Health = NodePath("../HealthComponent")
 HitFx = NodePath("../HitParticles")
 
-[node name="StatusEffectComponent" type="Node" parent="." unique_id=2016067092]
+[node name="StatusEffectComponent" type="Node" parent="."]
 script = ExtResource("12_xlup2")
 
-[node name="FireEffectComponent" type="Node" parent="." unique_id=599378746 node_paths=PackedStringArray("Health", "StatusEffectComponent", "FireFX")]
+[node name="FireEffectComponent" type="Node" parent="." node_paths=PackedStringArray("Health", "StatusEffectComponent", "FireFX")]
 script = ExtResource("13_mrjm6")
 Health = NodePath("../HealthComponent")
 StatusEffectComponent = NodePath("../StatusEffectComponent")
 FireFX = NodePath("../FireFX")
 
-[node name="IceEffectComponent" type="Node" parent="." unique_id=1515560540 node_paths=PackedStringArray("ComponentsToDisable", "StatusEffectComponent", "IceFx")]
+[node name="IceEffectComponent" type="Node" parent="." node_paths=PackedStringArray("ComponentsToDisable", "StatusEffectComponent", "IceFx")]
 script = ExtResource("14_pkino")
 ComponentsToDisable = [NodePath("../PeriodicShootingComponent"), NodePath("../DamageComponent")]
 StatusEffectComponent = NodePath("../StatusEffectComponent")
 IceFx = NodePath("../Ice FX")
 
-[node name="HitParticles" parent="." unique_id=579475644 instance=ExtResource("13_xlup2")]
+[node name="HitParticles" parent="." instance=ExtResource("13_xlup2")]
 position = Vector2(0, 1)
-process_material = SubResource("ParticleProcessMaterial_q78ru")
+process_material = SubResource("ParticleProcessMaterial_qxfb0")
 
-[node name="FireFX" parent="." unique_id=1136026281 instance=ExtResource("14_mrjm6")]
+[node name="FireFX" parent="." instance=ExtResource("14_mrjm6")]
 position = Vector2(0, 9)
 emitting = false
 amount = 2048
 
-[node name="Ice FX" parent="." unique_id=275134518 instance=ExtResource("15_pkino")]
+[node name="Ice FX" parent="." instance=ExtResource("15_pkino")]
 visible = false
 position = Vector2(1, 0)
 scale = Vector2(0.684407, 0.929677)
 
-[node name="laser spawn point right" type="Node2D" parent="." unique_id=915998238]
+[node name="laser spawn point right" type="Node2D" parent="."]
 position = Vector2(8, -2)
 
-[node name="laser spawn point left" type="Node2D" parent="." unique_id=1180867485]
+[node name="laser spawn point left" type="Node2D" parent="."]
 position = Vector2(-9, -2)
 
-[node name="Hitbox" type="Area2D" parent="." unique_id=1699649839]
+[node name="Hitbox" type="Area2D" parent="."]
 collision_layer = 8
 collision_mask = 20
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox" unique_id=379520850]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
 position = Vector2(0, 2)
 shape = SubResource("RectangleShape2D_cmp1h")
 
-[node name="PathFollowerComponent" type="Node2D" parent="." unique_id=1706994676]
+[node name="PathFollowerComponent" type="Node2D" parent="."]
 script = ExtResource("18_q78ru")
 ShouldRotate = false
 metadata/_custom_type_script = "uid://b4hvq2i66fjhi"

objects/entities/jump_pad.tscn

@@ -1,4 +1,4 @@
-[gd_scene format=3 uid="uid://cm3rixnnev1pg"]
+[gd_scene load_steps=4 format=3 uid="uid://cm3rixnnev1pg"]
 
 [ext_resource type="Texture2D" uid="uid://djifxc5x0dyrw" path="res://sprites/ppc_tileset.png" id="1_ctugi"]
 [ext_resource type="Script" uid="uid://bgbnof7aeydmq" path="res://scripts/components/JumpPadComponent.cs" id="2_huktk"]
@@ -6,23 +6,23 @@
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_ci3ij"]
 size = Vector2(16, 6)
 
-[node name="Jump pad" type="Area2D" unique_id=986549607]
+[node name="Jump pad" type="Area2D"]
 collision_layer = 0
 collision_mask = 4
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1755302504]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 position = Vector2(0, 5)
 shape = SubResource("RectangleShape2D_ci3ij")
 
-[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1150967280]
+[node name="Sprite2D" type="Sprite2D" parent="."]
 texture = ExtResource("1_ctugi")
 hframes = 12
 vframes = 12
 frame = 120
 
-[node name="JumpPadComponent" type="Node" parent="." unique_id=1295810804 node_paths=PackedStringArray("Area", "Sprite")]
+[node name="JumpPadComponent" type="Node" parent="." node_paths=PackedStringArray("Area", "Sprite")]
 script = ExtResource("2_huktk")
-JumpForce = 1210.0
+JumpForce = 1110.0
 Area = NodePath("..")
 Sprite = NodePath("../Sprite2D")
 StartAnimationIndex = 120

objects/entities/skill_pickup.tscn

@@ -1,32 +0,0 @@
-[gd_scene load_steps=5 format=3 uid="uid://0idmnkwids1r"]
-
-[ext_resource type="Texture2D" uid="uid://djifxc5x0dyrw" path="res://sprites/ppc_tileset.png" id="1_sprite"]
-[ext_resource type="Script" uid="uid://r4jybneigfcn" path="res://scripts/components/CollectableComponent.cs" id="2_collectable"]
-[ext_resource type="Script" uid="uid://bjln6jb1sigx2" path="res://scripts/components/FadeAwayComponent.cs" id="3_fadeaway"]
-
-[sub_resource type="CircleShape2D" id="CircleShape2D_pickup"]
-radius = 12.0
-
-[node name="SkillPickup" type="Area2D" groups=["Collectables"]]
-collision_layer = 2
-collision_mask = 4
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-shape = SubResource("CircleShape2D_pickup")
-
-[node name="Sprite2D" type="Sprite2D" parent="."]
-texture = ExtResource("1_sprite")
-hframes = 12
-vframes = 12
-frame = 24
-
-[node name="CollectableComponent" type="Node" parent="." node_paths=PackedStringArray("Area2D", "CollisionShape")]
-script = ExtResource("2_collectable")
-Area2D = NodePath("..")
-CollisionShape = NodePath("../CollisionShape2D")
-
-[node name="FadeAwayComponent" type="Node" parent="." node_paths=PackedStringArray("Sprite", "Area")]
-script = ExtResource("3_fadeaway")
-Sprite = NodePath("../Sprite2D")
-FadeDuration = 0.5
-Area = NodePath("..")

objects/entities/spaceship_enter.tscn

@@ -1,20 +1,18 @@
-[gd_scene format=3 uid="uid://lpovacvt3yyj"]
+[gd_scene load_steps=4 format=3 uid="uid://lpovacvt3yyj"]
 
 [ext_resource type="Texture2D" uid="uid://dhkwyv6ayb5qb" path="res://sprites/flying_ship.png" id="1_r82pf"]
 [ext_resource type="Script" uid="uid://dtv2r7q4elgre" path="res://scripts/components/SpaceshipEnterComponent.cs" id="2_wanmd"]
-[ext_resource type="Resource" uid="uid://d033qwwfs3i72" path="res://resources/movement_presets/spaceship_movement.tres" id="2_yda36"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_wanmd"]
 radius = 16.1245
 
-[node name="Spaceship Enter" type="Area2D" unique_id=916428603]
+[node name="Spaceship Enter" type="Area2D"]
 collision_layer = 0
 collision_mask = 4
 script = ExtResource("2_wanmd")
-Preset = ExtResource("2_yda36")
 
-[node name="Sprite2D" type="Sprite2D" parent="." unique_id=433507900]
+[node name="Sprite2D" type="Sprite2D" parent="."]
 texture = ExtResource("1_r82pf")
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=993596426]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource("CircleShape2D_wanmd")

objects/entities/spaceship_exit.tscn

@@ -1,15 +1,14 @@
-[gd_scene format=3 uid="uid://dkqa3q6j2gof4"]
+[gd_scene load_steps=3 format=3 uid="uid://dkqa3q6j2gof4"]
 
 [ext_resource type="Script" uid="uid://d3gfg05ll8uw3" path="res://scripts/components/SpaceshipExitComponent.cs" id="1_1cmfv"]
-[ext_resource type="Resource" uid="uid://vgutbpovj8hc" path="res://resources/movement_presets/platform_movement.tres" id="2_njt46"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_njt46"]
 
-[node name="Spaceship exit" type="Area2D" unique_id=922920366]
+[node name="Spaceship exit" type="Area2D" node_paths=PackedStringArray("Area")]
 collision_layer = 0
 collision_mask = 4
 script = ExtResource("1_1cmfv")
-Preset = ExtResource("2_njt46")
+Area = NodePath(".")
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1697409658]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource("RectangleShape2D_njt46")

objects/game_manager.tscn

@@ -1,7 +1,6 @@
-[gd_scene format=3 uid="uid://b4eifkc31jsun"]
+[gd_scene load_steps=8 format=3 uid="uid://b4eifkc31jsun"]
 
 [ext_resource type="Script" uid="uid://c6eoi3ymefc0x" path="res://Autoloads/GameManager.cs" id="1_t2tr6"]
-[ext_resource type="PackedScene" uid="uid://dwr3avefuwnpy" path="res://scenes/level_tutorial_1.tscn" id="2_7rb6w"]
 [ext_resource type="PackedScene" uid="uid://bol7g83v2accs" path="res://scenes/level_village_1.tscn" id="2_bentb"]
 [ext_resource type="PackedScene" uid="uid://chqb11pfoqmeb" path="res://scenes/level_village_2.tscn" id="3_ajlkg"]
 [ext_resource type="PackedScene" uid="uid://h60obxmju6mo" path="res://scenes/level_village_3.tscn" id="4_se5tb"]
@@ -9,9 +8,9 @@
 [ext_resource type="PackedScene" uid="uid://bbwef3n2gjkt8" path="res://scenes/level_village_5.tscn" id="6_7rb6w"]
 [ext_resource type="Script" uid="uid://chrhjch4ymfvr" path="res://scripts/Screenshot.cs" id="6_bbtu1"]
 
-[node name="GameManager" type="Node" unique_id=2076336659]
+[node name="GameManager" type="Node"]
 script = ExtResource("1_t2tr6")
-LevelScenes = Array[PackedScene]([ExtResource("2_7rb6w"), ExtResource("2_bentb"), ExtResource("3_ajlkg"), ExtResource("4_se5tb"), ExtResource("5_mnosh"), ExtResource("6_7rb6w")])
+LevelScenes = Array[PackedScene]([ExtResource("2_bentb"), ExtResource("3_ajlkg"), ExtResource("4_se5tb"), ExtResource("5_mnosh"), ExtResource("6_7rb6w")])
 
-[node name="Screenshot" type="Node" parent="." unique_id=812485936]
+[node name="Screenshot" type="Node" parent="."]
 script = ExtResource("6_bbtu1")

objects/movement_abilities/gravity_ability.tscn

@@ -1,8 +1,7 @@
-[gd_scene format=3 uid="uid://cala7bpo1v4no"]
+[gd_scene load_steps=2 format=3 uid="uid://cala7bpo1v4no"]
 
 [ext_resource type="Script" uid="uid://chgw53qwt7rt8" path="res://scripts/components/Movement/GravityAbility.cs" id="1_tn5sj"]
 
-[node name="GravityAbility" type="Node" unique_id=711941081]
+[node name="GravityAbility" type="Node"]
 script = ExtResource("1_tn5sj")
-DescendGravity = 1000.0
 metadata/_custom_type_script = "uid://chgw53qwt7rt8"

objects/movement_abilities/variable_jump_ability.tscn

@@ -1,9 +1,8 @@
-[gd_scene format=3 uid="uid://d0r5edxnx5jqx"]
+[gd_scene load_steps=2 format=3 uid="uid://d0r5edxnx5jqx"]
 
 [ext_resource type="Script" uid="uid://ccksp2e76s7sr" path="res://scripts/components/Movement/VariableJumpAbility.cs" id="1_y30i5"]
 
-[node name="VariableJumpAbility" type="Node" unique_id=735694377]
+[node name="VariableJumpAbility" type="Node"]
 script = ExtResource("1_y30i5")
-JumpHeight = 112.0
 JumpCutMultiplier = 0.507
 metadata/_custom_type_script = "uid://ccksp2e76s7sr"

objects/player_skills/x_ray_vision_skill_component.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=2 format=3 uid="uid://bimyb8suadq3u"]
+[gd_scene load_steps=2 format=3 uid="uid://dtxkjif7prm70"]
 
 [ext_resource type="Script" uid="uid://dl7vthhurirwc" path="res://scripts/components/XRayVisionSkillComponent.cs" id="1_ebn6n"]
 

objects/skill_manager.tscn

@@ -1,4 +1,4 @@
-[gd_scene format=3 uid="uid://bi6v7u17vg1ww"]
+[gd_scene load_steps=13 format=3 uid="uid://bi6v7u17vg1ww"]
 
 [ext_resource type="Script" uid="uid://dru77vj07e18s" path="res://Autoloads/SkillManager.cs" id="1_31033"]
 [ext_resource type="Script" uid="uid://d4crrfmbgxnqf" path="res://scripts/Resources/SkillData.cs" id="2_87da4"]
@@ -6,12 +6,13 @@
 [ext_resource type="Resource" uid="uid://cdp8sex36vdq2" path="res://resources/skills/explosive_brick.tres" id="4_53vnv"]
 [ext_resource type="Resource" uid="uid://cr5lo4h8wm0jc" path="res://resources/skills/fire_brick.tres" id="5_77gav"]
 [ext_resource type="Resource" uid="uid://ceakv6oqob6m7" path="res://resources/skills/ice_brick.tres" id="6_gib8v"]
+[ext_resource type="Resource" uid="uid://d3bjre2etov1n" path="res://resources/skills/magnetic.tres" id="7_6wy8o"]
 [ext_resource type="Resource" uid="uid://bxsgq8703qx4u" path="res://resources/skills/double_jump.tres" id="8_87da4"]
 [ext_resource type="Resource" uid="uid://cseilsspimw1n" path="res://resources/skills/ground_pound_skill.tres" id="9_77gav"]
-[ext_resource type="Resource" uid="uid://d3bjre2etov1n" path="res://resources/skills/magnetic.tres" id="10_gib8v"]
+[ext_resource type="Resource" uid="uid://c5dj06l86winx" path="res://resources/skills/xray_vision.tres" id="10_gib8v"]
 [ext_resource type="Resource" uid="uid://d12defdtmlk0u" path="res://resources/skills/brick_shield.tres" id="11_6wy8o"]
 [ext_resource type="Resource" uid="uid://dghnl301o1aiy" path="res://resources/skills/brick_armor.tres" id="12_gib8v"]
 
-[node name="SkillManager" type="Node" unique_id=1205356464]
+[node name="SkillManager" type="Node"]
 script = ExtResource("1_31033")
-AvailableSkills = Array[ExtResource("2_87da4")]([ExtResource("3_shjvi"), ExtResource("4_53vnv"), ExtResource("5_77gav"), ExtResource("6_gib8v"), ExtResource("10_gib8v"), ExtResource("8_87da4"), ExtResource("9_77gav"), ExtResource("11_6wy8o"), ExtResource("12_gib8v")])
+AvailableSkills = Array[ExtResource("2_87da4")]([ExtResource("3_shjvi"), ExtResource("4_53vnv"), ExtResource("5_77gav"), ExtResource("6_gib8v"), ExtResource("7_6wy8o"), ExtResource("8_87da4"), ExtResource("9_77gav"), ExtResource("10_gib8v"), ExtResource("11_6wy8o"), ExtResource("12_gib8v")])

objects/ui/display_settings.tscn

@@ -1,77 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://display_settings_scene"]
-
-[ext_resource type="Script" uid="uid://display_settings_script" path="res://scripts/UI/DisplaySettings.cs" id="1_dispset"]
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dispset"]
-bg_color = Color(0, 0, 0, 1)
-
-[node name="Display settings" type="Control" node_paths=PackedStringArray("WindowModeButton", "ResolutionButton", "DisplaySettingsControl")]
-layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-size_flags_horizontal = 6
-size_flags_vertical = 6
-script = ExtResource("1_dispset")
-WindowModeButton = NodePath("PanelContainer/MarginContainer/VBoxContainer/Window Mode/WindowModeButton")
-ResolutionButton = NodePath("PanelContainer/MarginContainer/VBoxContainer/Resolution/ResolutionButton")
-DisplaySettingsControl = NodePath(".")
-
-[node name="PanelContainer" type="PanelContainer" parent="."]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-theme_override_styles/panel = SubResource("StyleBoxFlat_dispset")
-
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"]
-layout_mode = 2
-theme_override_constants/margin_left = 8
-theme_override_constants/margin_top = 8
-theme_override_constants/margin_right = 8
-theme_override_constants/margin_bottom = 8
-
-[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer"]
-layout_mode = 2
-size_flags_horizontal = 4
-size_flags_vertical = 4
-
-[node name="Display" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer"]
-layout_mode = 2
-text = "DISPLAY"
-horizontal_alignment = 1
-vertical_alignment = 1
-uppercase = true
-
-[node name="Spacer" type="Control" parent="PanelContainer/MarginContainer/VBoxContainer"]
-custom_minimum_size = Vector2(0, 32)
-layout_mode = 2
-size_flags_vertical = 3
-
-[node name="Window Mode" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer"]
-layout_mode = 2
-theme_override_constants/separation = 4
-
-[node name="Label" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer/Window Mode"]
-layout_mode = 2
-text = "WINDOW_MODE"
-horizontal_alignment = 1
-
-[node name="WindowModeButton" type="OptionButton" parent="PanelContainer/MarginContainer/VBoxContainer/Window Mode"]
-layout_mode = 2
-
-[node name="Resolution" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer"]
-layout_mode = 2
-theme_override_constants/separation = 4
-
-[node name="Label" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer/Resolution"]
-layout_mode = 2
-text = "RESOLUTION"
-horizontal_alignment = 1
-
-[node name="ResolutionButton" type="OptionButton" parent="PanelContainer/MarginContainer/VBoxContainer/Resolution"]
-layout_mode = 2

objects/ui/gameplay_settings.tscn

@@ -1,97 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://gameplay_settings_scene"]
-
-[ext_resource type="Script" uid="uid://gameplay_settings_script" path="res://scripts/UI/GameplaySettings.cs" id="1_gameplay"]
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_gameplay"]
-bg_color = Color(0, 0, 0, 1)
-
-[node name="Gameplay Settings" type="Control" node_paths=PackedStringArray("DeadzoneSlider", "DeadzoneValueLabel", "SensitivitySlider", "SensitivityValueLabel", "GameplaySettingsControl")]
-layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-size_flags_horizontal = 6
-size_flags_vertical = 6
-script = ExtResource("1_gameplay")
-DeadzoneSlider = NodePath("PanelContainer/MarginContainer/VBoxContainer/Deadzone/HSlider")
-DeadzoneValueLabel = NodePath("PanelContainer/MarginContainer/VBoxContainer/Deadzone/HBoxContainer/DeadzoneValueLabel")
-SensitivitySlider = NodePath("PanelContainer/MarginContainer/VBoxContainer/Sensitivity/HSlider")
-SensitivityValueLabel = NodePath("PanelContainer/MarginContainer/VBoxContainer/Sensitivity/HBoxContainer/SensitivityValueLabel")
-GameplaySettingsControl = NodePath(".")
-
-[node name="PanelContainer" type="PanelContainer" parent="."]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-theme_override_styles/panel = SubResource("StyleBoxFlat_gameplay")
-
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"]
-layout_mode = 2
-theme_override_constants/margin_left = 8
-theme_override_constants/margin_top = 8
-theme_override_constants/margin_right = 8
-theme_override_constants/margin_bottom = 8
-
-[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer"]
-layout_mode = 2
-size_flags_horizontal = 4
-size_flags_vertical = 4
-
-[node name="Gameplay" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer"]
-layout_mode = 2
-text = "GAMEPLAY"
-horizontal_alignment = 1
-vertical_alignment = 1
-uppercase = true
-
-[node name="Spacer" type="Control" parent="PanelContainer/MarginContainer/VBoxContainer"]
-custom_minimum_size = Vector2(0, 32)
-layout_mode = 2
-size_flags_vertical = 3
-
-[node name="Deadzone" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer"]
-layout_mode = 2
-theme_override_constants/separation = 4
-
-[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer/Deadzone"]
-layout_mode = 2
-
-[node name="DeadzoneLabel" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer/Deadzone/HBoxContainer"]
-layout_mode = 2
-size_flags_horizontal = 3
-text = "GAMEPAD_DEADZONE"
-
-[node name="DeadzoneValueLabel" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer/Deadzone/HBoxContainer"]
-layout_mode = 2
-text = "0.20"
-
-[node name="HSlider" type="HSlider" parent="PanelContainer/MarginContainer/VBoxContainer/Deadzone"]
-custom_minimum_size = Vector2(64, 0)
-layout_mode = 2
-value = 0.2
-
-[node name="Sensitivity" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer"]
-layout_mode = 2
-theme_override_constants/separation = 4
-
-[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer/Sensitivity"]
-layout_mode = 2
-
-[node name="SensitivityLabel" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer/Sensitivity/HBoxContainer"]
-layout_mode = 2
-size_flags_horizontal = 3
-text = "GAMEPAD_SENSITIVITY"
-
-[node name="SensitivityValueLabel" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer/Sensitivity/HBoxContainer"]
-layout_mode = 2
-text = "1.00"
-
-[node name="HSlider" type="HSlider" parent="PanelContainer/MarginContainer/VBoxContainer/Sensitivity"]
-custom_minimum_size = Vector2(64, 0)
-layout_mode = 2
-value = 1.0

objects/ui/input_settings.tscn

@@ -1,23 +1,17 @@
-[gd_scene load_steps=4 format=3 uid="uid://cvfsbiy5ggrpg"]
+[gd_scene load_steps=3 format=3 uid="uid://cvfsbiy5ggrpg"]
 
 [ext_resource type="PackedScene" uid="uid://bxpr4m7lq7clh" path="res://objects/ui/input_button.tscn" id="1_h8s4o"]
-[ext_resource type="Script" uid="uid://input_settings_script" path="res://scripts/UI/InputSettings.cs" id="2_inputs"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_se25o"]
 bg_color = Color(0, 0, 0, 1)
 
-[node name="Input Settings" type="Control" node_paths=PackedStringArray("ActionsContainer", "ResetButton", "InputSettingsControl")]
+[node name="Input Settings" type="Control"]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-script = ExtResource("2_inputs")
-ActionsContainer = NodePath("PanelContainer/MarginContainer/VBoxContainer/ScrollContainer/Actions")
-ResetButton = NodePath("PanelContainer/MarginContainer/VBoxContainer/Reset to default Button")
-InputSettingsControl = NodePath(".")
-InputButtonScene = ExtResource("1_h8s4o")
 
 [node name="PanelContainer" type="PanelContainer" parent="."]
 layout_mode = 1
@@ -54,6 +48,24 @@ layout_mode = 2
 size_flags_horizontal = 3
 theme_override_constants/separation = 8
 
+[node name="Input button" parent="PanelContainer/MarginContainer/VBoxContainer/ScrollContainer/Actions" instance=ExtResource("1_h8s4o")]
+layout_mode = 2
+
+[node name="Input button2" parent="PanelContainer/MarginContainer/VBoxContainer/ScrollContainer/Actions" instance=ExtResource("1_h8s4o")]
+layout_mode = 2
+
+[node name="Input button3" parent="PanelContainer/MarginContainer/VBoxContainer/ScrollContainer/Actions" instance=ExtResource("1_h8s4o")]
+layout_mode = 2
+
+[node name="Input button4" parent="PanelContainer/MarginContainer/VBoxContainer/ScrollContainer/Actions" instance=ExtResource("1_h8s4o")]
+layout_mode = 2
+
+[node name="Input button5" parent="PanelContainer/MarginContainer/VBoxContainer/ScrollContainer/Actions" instance=ExtResource("1_h8s4o")]
+layout_mode = 2
+
+[node name="Input button6" parent="PanelContainer/MarginContainer/VBoxContainer/ScrollContainer/Actions" instance=ExtResource("1_h8s4o")]
+layout_mode = 2
+
 [node name="Reset to default Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
 text = "RESET_TO_DEFAULT_BUTTON"

objects/ui/marketplace_button.tscn

@@ -4,7 +4,6 @@
 [ext_resource type="Script" uid="uid://vokgv56bjpf1" path="res://scripts/UI/MarketplaceButton.cs" id="2_vb2qn"]
 
 [node name="MarketplaceButton" type="Button" node_paths=PackedStringArray("SkillLevelContainer")]
-focus_mode = 2
 offset_right = 8.0
 offset_bottom = 8.0
 size_flags_horizontal = 3

objects/ui/pause_menu.tscn

@@ -1,4 +1,4 @@
-[gd_scene format=3 uid="uid://i6mnjbjcoqe5"]
+[gd_scene load_steps=4 format=3 uid="uid://i6mnjbjcoqe5"]
 
 [ext_resource type="Script" uid="uid://cakgxndurgfa3" path="res://scripts/UI/PauseMenu.cs" id="1_h4pd5"]
 [ext_resource type="PackedScene" uid="uid://cl00e2ocomk3m" path="res://scenes/main_menu.tscn" id="2_h4pd5"]
@@ -6,7 +6,7 @@
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_g4ivv"]
 bg_color = Color(0, 0, 0, 1)
 
-[node name="Pause menu" type="Control" unique_id=923659871 node_paths=PackedStringArray("PauseMenuControl", "ResumeButton", "MainMenuButton", "QuitButton", "SettingsButton")]
+[node name="Pause menu" type="Control" node_paths=PackedStringArray("PauseMenuControl", "ResumeButton", "MainMenuButton", "QuitButton", "SettingsButton")]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -23,7 +23,7 @@ QuitButton = NodePath("PanelContainer/MarginContainer/VBoxContainer/Quit game Bu
 SettingsButton = NodePath("PanelContainer/MarginContainer/VBoxContainer/Settings Button")
 MainMenuScene = ExtResource("2_h4pd5")
 
-[node name="PanelContainer" type="PanelContainer" parent="." unique_id=1782689001]
+[node name="PanelContainer" type="PanelContainer" parent="."]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -32,52 +32,46 @@ grow_horizontal = 2
 grow_vertical = 2
 theme_override_styles/panel = SubResource("StyleBoxFlat_g4ivv")
 
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer" unique_id=824088919]
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"]
 layout_mode = 2
 theme_override_constants/margin_left = 8
 theme_override_constants/margin_top = 8
 theme_override_constants/margin_right = 8
 theme_override_constants/margin_bottom = 8
 
-[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer" unique_id=1826945529]
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer"]
 layout_mode = 2
 size_flags_horizontal = 4
 size_flags_vertical = 4
 
-[node name="Pause" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer" unique_id=1706564131]
+[node name="Pause" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
 text = "PAUSE"
 horizontal_alignment = 1
 vertical_alignment = 1
 uppercase = true
 
-[node name="Spacer" type="Control" parent="PanelContainer/MarginContainer/VBoxContainer" unique_id=868621584]
+[node name="Spacer" type="Control" parent="PanelContainer/MarginContainer/VBoxContainer"]
 custom_minimum_size = Vector2(0, 32)
 layout_mode = 2
 size_flags_vertical = 3
 
-[node name="Resume Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer" unique_id=826636099]
+[node name="Resume Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
-focus_next = NodePath("../Settings Button")
 text = "RESUME_BUTTON"
 flat = true
 
-[node name="Settings Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer" unique_id=334350065]
+[node name="Settings Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
-focus_next = NodePath("../Exit to menu Button")
-focus_previous = NodePath("../Resume Button")
 text = "SETTINGS_BUTTON"
 flat = true
 
-[node name="Exit to menu Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer" unique_id=683937353]
+[node name="Exit to menu Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
-focus_next = NodePath("../Quit game Button")
-focus_previous = NodePath("../Settings Button")
 text = "EXIT_TO_MENU_BUTTON"
 flat = true
 
-[node name="Quit game Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer" unique_id=2008979602]
+[node name="Quit game Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
-focus_previous = NodePath("../Exit to menu Button")
 text = "QUIT_BUTTON"
 flat = true

objects/ui/settings_menu.tscn

@@ -53,11 +53,13 @@ size_flags_vertical = 3
 
 [node name="Input Settings Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
+disabled = true
 text = "INPUT_BUTTON"
 flat = true
 
 [node name="Display Settings Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
+disabled = true
 text = "DISPLAY_BUTTON"
 flat = true
 
@@ -68,6 +70,7 @@ flat = true
 
 [node name="Gameplay Settings Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
+disabled = true
 text = "GAMEPLAY_BUTTON"
 flat = true
 

objects/ui/skill_button.tscn

@@ -4,7 +4,6 @@
 [ext_resource type="Script" uid="uid://bw8dlgq86jrtt" path="res://scripts/UI/SkillButton.cs" id="2_m2732"]
 
 [node name="SkillButton" type="Button"]
-focus_mode = 2
 offset_right = 8.0
 offset_bottom = 8.0
 size_flags_horizontal = 3

project.godot

@@ -8,10 +8,6 @@
 
 config_version=5
 
-[animation]
-
-compatibility/default_parent_skeleton_in_mesh_instance_3d=true
-
 [application]
 
 config/name="Mr. Brick Adventures"
@@ -23,11 +19,11 @@ config/version="in-dev"
 run/main_scene="uid://cl00e2ocomk3m"
 config/use_custom_user_dir=true
 config/custom_user_dir_name="MrBrickAdventures"
-config/features=PackedStringArray("4.6", "C#", "GL Compatibility")
+config/features=PackedStringArray("4.5", "C#", "GL Compatibility")
 run/max_fps=180
 boot_splash/bg_color=Color(0, 0, 0, 1)
 boot_splash/show_image=false
-boot_splash/stretch_mode=0
+boot_splash/fullsize=false
 boot_splash/use_filter=false
 config/icon="uid://jix7wdn0isr3"
 
@@ -37,23 +33,22 @@ PhantomCameraManager="*res://addons/phantom_camera/scripts/managers/phantom_came
 AudioController="*res://objects/audio_controller.tscn"
 UIManager="*res://Autoloads/UIManager.cs"
 ConfigFileHandler="*res://Autoloads/ConfigFileHandler.cs"
-SettingsManager="*res://Autoloads/SettingsManager.cs"
-InputDeviceManager="*res://Autoloads/InputDeviceManager.cs"
 SaveSystem="*res://Autoloads/SaveSystem.cs"
 ConsoleManager="*res://Autoloads/ConsoleManager.cs"
-LimboConsole="*uid://dyxornv8vwibg"
+LimboConsole="*res://addons/limbo_console/limbo_console.gd"
 DialogueManager="*res://addons/dialogue_manager/dialogue_manager.gd"
-EventBus="*res://Autoloads/EventBus.cs"
 SteamManager="*res://Autoloads/SteamManager.cs"
 AchievementManager="*res://objects/achievement_manager.tscn"
 SkillManager="*res://objects/skill_manager.tscn"
 FloatingTextManager="*res://objects/floating_text_manager.tscn"
+EventBus="*res://Autoloads/EventBus.cs"
+StatisticsManager="*res://Autoloads/StatisticsManager.cs"
 SpeedRunManager="res://Autoloads/SpeedRunManager.cs"
 GhostManager="res://objects/ghost_manager.tscn"
 StatisticsEventHandler="*res://scripts/Events/StatisticsEventHandler.cs"
 CoinStateHandler="*res://scripts/Events/CoinStateHandler.cs"
+LevelStateHandler="*res://scripts/Events/LevelStateHandler.cs"
 LivesStateHandler="*res://scripts/Events/LivesStateHandler.cs"
-SkillCollectHandler="*res://scripts/Events/SkillCollectHandler.cs"
 GameStateStore="*res://Autoloads/GameStateStore.cs"
 GameManager="*res://objects/game_manager.tscn"
 

resources/collectables/big_coin.tres

@@ -1,8 +1,8 @@
-[gd_resource type="Resource" format=3 uid="uid://bsnr5v2b2mfsl"]
+[gd_resource type="Resource" load_steps=2 format=3 uid="uid://bsnr5v2b2mfsl"]
 
 [ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/Resources/CollectableResource.cs" id="1_wfbgp"]
 
 [resource]
 script = ExtResource("1_wfbgp")
 Amount = 5.0
-Type = 1
+Type = 0

resources/collectables/big_treasure.tres

@@ -1,8 +1,8 @@
-[gd_resource type="Resource" format=3 uid="uid://b6xqotmke54x"]
+[gd_resource type="Resource" load_steps=2 format=3 uid="uid://b6xqotmke54x"]
 
 [ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/Resources/CollectableResource.cs" id="1_5mosu"]
 
 [resource]
 script = ExtResource("1_5mosu")
 Amount = 50.0
-Type = 1
+Type = 0

resources/collectables/child.tres

@@ -1,8 +1,8 @@
-[gd_resource type="Resource" format=3 uid="uid://b6apusc0jmi3x"]
+[gd_resource type="Resource" load_steps=2 format=3 uid="uid://b6apusc0jmi3x"]
 
 [ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/Resources/CollectableResource.cs" id="1_d8txc"]
 
 [resource]
 script = ExtResource("1_d8txc")
 Amount = 1.0
-Type = 2
+Type = 1

resources/collectables/coin.tres

@@ -1,8 +1,8 @@
-[gd_resource type="Resource" format=3 uid="uid://vql535ckoeqm"]
+[gd_resource type="Resource" load_steps=2 format=3 uid="uid://vql535ckoeqm"]
 
 [ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/Resources/CollectableResource.cs" id="1_7pquc"]
 
 [resource]
 script = ExtResource("1_7pquc")
 Amount = 1.0
-Type = 1
+Type = 0

resources/collectables/double_jump_pickup.tres

@@ -1,9 +0,0 @@
-[gd_resource type="Resource" format=3 uid="uid://dfyp1n4p52ydm"]
-
-[ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/Resources/CollectableResource.cs" id="1_script"]
-[ext_resource type="Resource" uid="uid://bxsgq8703qx4u" path="res://resources/skills/double_jump.tres" id="2_skill"]
-
-[resource]
-script = ExtResource("1_script")
-Type = 4
-Skill = ExtResource("2_skill")

resources/collectables/small_health_potion.tres

@@ -1,8 +1,9 @@
-[gd_resource type="Resource" format=3 uid="uid://2tl3yoh202no"]
+[gd_resource type="Resource" load_steps=2 format=3 uid="uid://2tl3yoh202no"]
 
 [ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/Resources/CollectableResource.cs" id="1_brkhb"]
 
 [resource]
 script = ExtResource("1_brkhb")
 Amount = 0.25
-Type = 3
+Type = 2
+metadata/_custom_type_script = "uid://cb5f0mx0hrt3b"

resources/collectables/treasure.tres

@@ -1,8 +1,8 @@
-[gd_resource type="Resource" format=3 uid="uid://bws2xldndlre1"]
+[gd_resource type="Resource" load_steps=2 format=3 uid="uid://bws2xldndlre1"]
 
 [ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/Resources/CollectableResource.cs" id="1_clntw"]
 
 [resource]
 script = ExtResource("1_clntw")
 Amount = 50.0
-Type = 1
+Type = 0

resources/movement_presets/platform_movement.tres

@@ -1,12 +0,0 @@
-[gd_resource type="Resource" script_class="MovementPreset" format=3 uid="uid://vgutbpovj8hc"]
-
-[ext_resource type="Script" uid="uid://tt1los3lafsi" path="res://scripts/Resources/MovementPreset.cs" id="1_0yvgi"]
-[ext_resource type="PackedScene" uid="uid://bcv8kx6bc7u5e" path="res://objects/movement_abilities/ground_ability.tscn" id="1_sll4h"]
-[ext_resource type="PackedScene" uid="uid://d0r5edxnx5jqx" path="res://objects/movement_abilities/variable_jump_ability.tscn" id="2_g20lq"]
-[ext_resource type="PackedScene" uid="uid://cala7bpo1v4no" path="res://objects/movement_abilities/gravity_ability.tscn" id="3_085b1"]
-[ext_resource type="PackedScene" uid="uid://bty3jq8u0pxkf" path="res://objects/movement_abilities/one_way_platform_ability.tscn" id="4_yebn0"]
-
-[resource]
-script = ExtResource("1_0yvgi")
-Abilities = [ExtResource("1_sll4h"), ExtResource("2_g20lq"), ExtResource("3_085b1"), ExtResource("4_yebn0")]
-metadata/_custom_type_script = "uid://tt1los3lafsi"

resources/movement_presets/spaceship_movement.tres

@@ -1,9 +0,0 @@
-[gd_resource type="Resource" script_class="MovementPreset" format=3 uid="uid://d033qwwfs3i72"]
-
-[ext_resource type="Script" uid="uid://tt1los3lafsi" path="res://scripts/Resources/MovementPreset.cs" id="1_dfw61"]
-[ext_resource type="PackedScene" uid="uid://bu3vuxlrvoo1t" path="res://objects/movement_abilities/spaceship_ability.tscn" id="1_hadk8"]
-
-[resource]
-script = ExtResource("1_dfw61")
-Abilities = [ExtResource("1_hadk8")]
-metadata/_custom_type_script = "uid://tt1los3lafsi"

resources/skills/brick_armor.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="SkillData" format=3 uid="uid://dghnl301o1aiy"]
+[gd_resource type="Resource" script_class="SkillData" load_steps=5 format=3 uid="uid://dghnl301o1aiy"]
 
 [ext_resource type="PackedScene" uid="uid://cdeh7wfc62fr4" path="res://objects/player_skills/brick_armor_skill_component.tscn" id="1_aqcna"]
 [ext_resource type="Script" uid="uid://d4crrfmbgxnqf" path="res://scripts/Resources/SkillData.cs" id="1_unqwr"]

resources/skills/brick_shield.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="SkillData" format=3 uid="uid://d12defdtmlk0u"]
+[gd_resource type="Resource" script_class="SkillData" load_steps=6 format=3 uid="uid://d12defdtmlk0u"]
 
 [ext_resource type="Script" uid="uid://d4crrfmbgxnqf" path="res://scripts/Resources/SkillData.cs" id="1_m360g"]
 [ext_resource type="PackedScene" uid="uid://blwk5qduvdnxv" path="res://objects/player_skills/brick_shield_skill_component.tscn" id="1_xjknp"]

resources/skills/double_jump.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="SkillData" format=3 uid="uid://bxsgq8703qx4u"]
+[gd_resource type="Resource" script_class="SkillData" load_steps=5 format=3 uid="uid://bxsgq8703qx4u"]
 
 [ext_resource type="Script" uid="uid://d4crrfmbgxnqf" path="res://scripts/Resources/SkillData.cs" id="1_p5qvt"]
 [ext_resource type="PackedScene" uid="uid://dwaxbojb44a6l" path="res://objects/player_skills/double_jump_skill.tscn" id="1_t7o84"]

resources/skills/ground_pound_skill.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="SkillData" format=3 uid="uid://cseilsspimw1n"]
+[gd_resource type="Resource" script_class="SkillData" load_steps=5 format=3 uid="uid://cseilsspimw1n"]
 
 [ext_resource type="PackedScene" uid="uid://lu3wvpqefekn" path="res://objects/player_skills/ground_pound_skill_component.tscn" id="1_auljr"]
 [ext_resource type="Script" uid="uid://d4crrfmbgxnqf" path="res://scripts/Resources/SkillData.cs" id="1_i1qac"]

resources/skills/wall_jump.tres

@@ -1,8 +0,0 @@
-[gd_resource type="Resource" script_class="SkillData" format=3 uid="uid://mwqffpqncwxo"]
-
-[ext_resource type="Script" uid="uid://dwb0e05pewcsn" path="res://scripts/Resources/SkillUpgrade.cs" id="1_vptvl"]
-[ext_resource type="Script" uid="uid://d4crrfmbgxnqf" path="res://scripts/Resources/SkillData.cs" id="2_rw7jf"]
-
-[resource]
-script = ExtResource("2_rw7jf")
-metadata/_custom_type_script = "uid://d4crrfmbgxnqf"

resources/skills/xray_vision.tres

@@ -0,0 +1,31 @@
+[gd_resource type="Resource" script_class="SkillData" load_steps=6 format=3 uid="uid://c5dj06l86winx"]
+
+[ext_resource type="PackedScene" uid="uid://dtxkjif7prm70" path="res://objects/player_skills/x_ray_vision_skill_component.tscn" id="1_ax2d8"]
+[ext_resource type="Script" uid="uid://d4crrfmbgxnqf" path="res://scripts/Resources/SkillData.cs" id="1_g8qe3"]
+[ext_resource type="Script" uid="uid://dwb0e05pewcsn" path="res://scripts/Resources/SkillUpgrade.cs" id="2_o726x"]
+
+[sub_resource type="Resource" id="Resource_72ltj"]
+script = ExtResource("2_o726x")
+Cost = 200
+Description = ""
+Properties = Dictionary[String, Variant]({
+"duration": 5.0
+})
+metadata/_custom_type_script = "uid://dwb0e05pewcsn"
+
+[sub_resource type="Resource" id="Resource_2kdfi"]
+script = ExtResource("2_o726x")
+Cost = 275
+Description = ""
+Properties = Dictionary[String, Variant]({
+"duration": 10.0
+})
+metadata/_custom_type_script = "uid://dwb0e05pewcsn"
+
+[resource]
+script = ExtResource("1_g8qe3")
+Name = "XRAY_VISION"
+Description = "XRAY_VISION_DESCRIPTION"
+Node = ExtResource("1_ax2d8")
+Upgrades = Array[ExtResource("2_o726x")]([SubResource("Resource_72ltj"), SubResource("Resource_2kdfi")])
+metadata/_custom_type_script = "uid://d4crrfmbgxnqf"

resources/tilesets/village/background_tileset.tres

@@ -1,4 +1,4 @@
-[gd_resource type="TileSet" format=3 uid="uid://dua4ns4tdknd1"]
+[gd_resource type="TileSet" load_steps=3 format=3 uid="uid://dua4ns4tdknd1"]
 
 [ext_resource type="Texture2D" uid="uid://cysarpu6snb2y" path="res://sprites/ppc-tileset.png" id="4_ffexy"]
 

resources/tilesets/village/entities.tres

@@ -1,4 +1,4 @@
-[gd_resource type="TileSet" format=3 uid="uid://bc5a20s6kuy8e"]
+[gd_resource type="TileSet" load_steps=23 format=3 uid="uid://bc5a20s6kuy8e"]
 
 [ext_resource type="Texture2D" uid="uid://djifxc5x0dyrw" path="res://sprites/ppc_tileset.png" id="1_ej5iv"]
 [ext_resource type="PackedScene" uid="uid://54w4wisfj8v8" path="res://objects/entities/coin.tscn" id="2_31a0q"]

resources/tilesets/village/foreground.tres

@@ -1,4 +1,4 @@
-[gd_resource type="TileSet" format=3 uid="uid://bbppo0irxdmqy"]
+[gd_resource type="TileSet" load_steps=9 format=3 uid="uid://bbppo0irxdmqy"]
 
 [ext_resource type="Texture2D" uid="uid://djifxc5x0dyrw" path="res://sprites/ppc_tileset.png" id="1_6ec4i"]
 [ext_resource type="Texture2D" uid="uid://cw42lvnqxubq2" path="res://sprites/PS_Tileset_10_nes.png" id="2_0dgh6"]

resources/tilesets/village/small_foreground.tres

@@ -1,4 +1,4 @@
-[gd_resource type="TileSet" format=3 uid="uid://ccffmjebvuoaj"]
+[gd_resource type="TileSet" load_steps=3 format=3 uid="uid://ccffmjebvuoaj"]
 
 [ext_resource type="Texture2D" uid="uid://dxvevrm15uus1" path="res://sprites/flowers_tileset.png" id="1_6pkiv"]
 

resources/tilesets/village/terain.tres

@@ -1,4 +1,4 @@
-[gd_resource type="TileSet" format=3 uid="uid://cu2sx7qigrqnv"]
+[gd_resource type="TileSet" load_steps=11 format=3 uid="uid://cu2sx7qigrqnv"]
 
 [ext_resource type="Texture2D" uid="uid://do6m4ry8ss01e" path="res://sprites/PS_Tileset_12_nes.png" id="1_2p3w4"]
 [ext_resource type="Texture2D" uid="uid://cw42lvnqxubq2" path="res://sprites/PS_Tileset_10_nes.png" id="2_43n76"]
@@ -2034,19 +2034,12 @@ texture = ExtResource("4_i332m")
 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_ixyyn"]
 texture = ExtResource("5_q7rhw")
 1:0/0 = 0
-1:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 2:0/0 = 0
-2:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 3:0/0 = 0
-3:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 6:0/0 = 0
-6:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 8:0/0 = 0
-8:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 9:0/0 = 0
-9:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 10:0/0 = 0
-10:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 13:0/0 = 0
 14:0/0 = 0
 15:0/0 = 0
@@ -2081,17 +2074,11 @@ texture = ExtResource("5_q7rhw")
 56:0/0 = 0
 57:0/0 = 0
 0:1/0 = 0
-0:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 1:1/0 = 0
-1:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 2:1/0 = 0
-2:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 3:1/0 = 0
-3:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 4:1/0 = 0
-4:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 6:1/0 = 0
-6:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 7:1/0 = 0
 8:1/0 = 0
 9:1/0 = 0
@@ -2141,17 +2128,11 @@ texture = ExtResource("5_q7rhw")
 56:1/0 = 0
 57:1/0 = 0
 0:2/0 = 0
-0:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 1:2/0 = 0
-1:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 2:2/0 = 0
-2:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 3:2/0 = 0
-3:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 4:2/0 = 0
-4:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 6:2/0 = 0
-6:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 7:2/0 = 0
 8:2/0 = 0
 9:2/0 = 0
@@ -2194,17 +2175,11 @@ texture = ExtResource("5_q7rhw")
 56:2/0 = 0
 57:2/0 = 0
 0:3/0 = 0
-0:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 1:3/0 = 0
-1:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 2:3/0 = 0
-2:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 3:3/0 = 0
-3:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 4:3/0 = 0
-4:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 6:3/0 = 0
-6:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 7:3/0 = 0
 8:3/0 = 0
 9:3/0 = 0
@@ -2254,11 +2229,8 @@ texture = ExtResource("5_q7rhw")
 56:3/0 = 0
 57:3/0 = 0
 1:4/0 = 0
-1:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 2:4/0 = 0
-2:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 3:4/0 = 0
-3:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 7:4/0 = 0
 8:4/0 = 0
 9:4/0 = 0
@@ -2432,11 +2404,9 @@ texture = ExtResource("5_q7rhw")
 49:8/0 = 0
 50:8/0 = 0
 0:9/0 = 0
-0:9/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 1:9/0 = 0
 3:9/0 = 0
 4:9/0 = 0
-4:9/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 7:9/0 = 0
 8:9/0 = 0
 9:9/0 = 0
@@ -2471,15 +2441,10 @@ texture = ExtResource("5_q7rhw")
 49:9/0 = 0
 50:9/0 = 0
 0:10/0 = 0
-0:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 1:10/0 = 0
-1:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 2:10/0 = 0
-2:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 3:10/0 = 0
-3:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 4:10/0 = 0
-4:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 6:10/0 = 0
 7:10/0 = 0
 8:10/0 = 0
@@ -2518,31 +2483,18 @@ texture = ExtResource("5_q7rhw")
 49:10/0 = 0
 50:10/0 = 0
 0:11/0 = 0
-0:11/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 1:11/0 = 0
-1:11/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 2:11/0 = 0
-2:11/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 3:11/0 = 0
-3:11/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 6:11/0 = 0
-6:11/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 7:11/0 = 0
-7:11/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 8:11/0 = 0
-8:11/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 9:11/0 = 0
-9:11/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 10:11/0 = 0
-10:11/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 11:11/0 = 0
-11:11/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 12:11/0 = 0
-12:11/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 13:11/0 = 0
-13:11/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 14:11/0 = 0
-14:11/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 23:11/0 = 0
 24:11/0 = 0
 25:11/0 = 0
@@ -2566,25 +2518,15 @@ texture = ExtResource("5_q7rhw")
 45:11/0 = 0
 46:11/0 = 0
 0:12/0 = 0
-0:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 1:12/0 = 0
-1:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 2:12/0 = 0
-2:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 3:12/0 = 0
-3:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 4:12/0 = 0
-4:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 5:12/0 = 0
-5:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 6:12/0 = 0
-6:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 7:12/0 = 0
-7:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 8:12/0 = 0
-8:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 9:12/0 = 0
-9:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 17:12/0 = 0
 18:12/0 = 0
 19:12/0 = 0
@@ -2601,40 +2543,24 @@ texture = ExtResource("5_q7rhw")
 36:12/0 = 0
 38:12/0 = 0
 0:13/0 = 0
-0:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 1:13/0 = 0
-1:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 2:13/0 = 0
-2:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 3:13/0 = 0
-3:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 4:13/0 = 0
-4:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 5:13/0 = 0
-5:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 6:13/0 = 0
-6:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 7:13/0 = 0
-7:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 8:13/0 = 0
-8:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 9:13/0 = 0
-9:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 17:13/0 = 0
 18:13/0 = 0
 19:13/0 = 0
 20:13/0 = 0
-20:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 21:13/0 = 0
-21:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 22:13/0 = 0
-22:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 23:13/0 = 0
-23:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 24:13/0 = 0
-24:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 25:13/0 = 0
-25:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 26:13/0 = 0
 27:13/0 = 0
 29:13/0 = 0
@@ -2657,40 +2583,24 @@ texture = ExtResource("5_q7rhw")
 46:13/0 = 0
 47:13/0 = 0
 0:14/0 = 0
-0:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 1:14/0 = 0
-1:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 2:14/0 = 0
-2:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 3:14/0 = 0
-3:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 4:14/0 = 0
-4:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 5:14/0 = 0
-5:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 6:14/0 = 0
-6:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 7:14/0 = 0
-7:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 8:14/0 = 0
-8:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 9:14/0 = 0
-9:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 10:14/0 = 0
-10:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 17:14/0 = 0
 18:14/0 = 0
 19:14/0 = 0
 20:14/0 = 0
-20:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 21:14/0 = 0
-21:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 22:14/0 = 0
-22:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 23:14/0 = 0
-23:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 25:14/0 = 0
-25:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 26:14/0 = 0
 29:14/0 = 0
 30:14/0 = 0
@@ -2712,42 +2622,25 @@ texture = ExtResource("5_q7rhw")
 46:14/0 = 0
 47:14/0 = 0
 0:15/0 = 0
-0:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 1:15/0 = 0
-1:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 2:15/0 = 0
-2:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 3:15/0 = 0
-3:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 4:15/0 = 0
-4:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 5:15/0 = 0
-5:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 6:15/0 = 0
-6:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 7:15/0 = 0
-7:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 8:15/0 = 0
-8:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 9:15/0 = 0
-9:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 10:15/0 = 0
-10:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 17:15/0 = 0
 18:15/0 = 0
 19:15/0 = 0
 20:15/0 = 0
-20:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 21:15/0 = 0
-21:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 22:15/0 = 0
-22:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 23:15/0 = 0
-23:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 24:15/0 = 0
-24:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 25:15/0 = 0
-25:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 26:15/0 = 0
 29:15/0 = 0
 30:15/0 = 0
@@ -2769,33 +2662,19 @@ texture = ExtResource("5_q7rhw")
 46:15/0 = 0
 47:15/0 = 0
 4:16/0 = 0
-4:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 5:16/0 = 0
-5:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 6:16/0 = 0
-6:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 7:16/0 = 0
-7:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 8:16/0 = 0
-8:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 17:16/0 = 0
-17:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 18:16/0 = 0
-18:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 19:16/0 = 0
-19:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 20:16/0 = 0
-20:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 21:16/0 = 0
-21:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 22:16/0 = 0
-22:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 23:16/0 = 0
-23:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 24:16/0 = 0
-24:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 25:16/0 = 0
-25:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 26:16/0 = 0
 29:16/0 = 0
 30:16/0 = 0
@@ -2817,21 +2696,13 @@ texture = ExtResource("5_q7rhw")
 46:16/0 = 0
 47:16/0 = 0
 17:17/0 = 0
-17:17/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 19:17/0 = 0
-19:17/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 20:17/0 = 0
-20:17/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 21:17/0 = 0
-21:17/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 22:17/0 = 0
-22:17/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 23:17/0 = 0
-23:17/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 24:17/0 = 0
-24:17/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 25:17/0 = 0
-25:17/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 29:17/0 = 0
 30:17/0 = 0
 32:17/0 = 0
@@ -2856,23 +2727,14 @@ texture = ExtResource("5_q7rhw")
 4:18/0 = 0
 5:18/0 = 0
 17:18/0 = 0
-17:18/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 18:18/0 = 0
-18:18/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 19:18/0 = 0
-19:18/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 20:18/0 = 0
-20:18/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 21:18/0 = 0
-21:18/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 22:18/0 = 0
-22:18/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 23:18/0 = 0
-23:18/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 24:18/0 = 0
-24:18/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 25:18/0 = 0
-25:18/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 27:18/0 = 0
 29:18/0 = 0
 30:18/0 = 0
@@ -2904,20 +2766,14 @@ texture = ExtResource("5_q7rhw")
 8:19/0 = 0
 9:19/0 = 0
 17:19/0 = 0
-17:19/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 18:19/0 = 0
-18:19/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 19:19/0 = 0
-19:19/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 20:19/0 = 0
 21:19/0 = 0
 22:19/0 = 0
 23:19/0 = 0
-23:19/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 24:19/0 = 0
-24:19/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 25:19/0 = 0
-25:19/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 26:19/0 = 0
 27:19/0 = 0
 28:19/0 = 0
@@ -2949,18 +2805,13 @@ texture = ExtResource("5_q7rhw")
 6:20/0 = 0
 7:20/0 = 0
 17:20/0 = 0
-17:20/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 18:20/0 = 0
-18:20/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 19:20/0 = 0
-19:20/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 20:20/0 = 0
 21:20/0 = 0
 22:20/0 = 0
 23:20/0 = 0
-23:20/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 25:20/0 = 0
-25:20/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 26:20/0 = 0
 27:20/0 = 0
 28:20/0 = 0
@@ -2987,20 +2838,14 @@ texture = ExtResource("5_q7rhw")
 2:21/0 = 0
 3:21/0 = 0
 17:21/0 = 0
-17:21/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 18:21/0 = 0
-18:21/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 19:21/0 = 0
-19:21/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 20:21/0 = 0
 21:21/0 = 0
 22:21/0 = 0
 23:21/0 = 0
-23:21/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 24:21/0 = 0
-24:21/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 25:21/0 = 0
-25:21/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 26:21/0 = 0
 27:21/0 = 0
 28:21/0 = 0
@@ -3026,20 +2871,14 @@ texture = ExtResource("5_q7rhw")
 2:22/0 = 0
 3:22/0 = 0
 17:22/0 = 0
-17:22/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 18:22/0 = 0
-18:22/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 19:22/0 = 0
-19:22/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 20:22/0 = 0
 21:22/0 = 0
 22:22/0 = 0
 23:22/0 = 0
-23:22/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 24:22/0 = 0
-24:22/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 25:22/0 = 0
-25:22/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 26:22/0 = 0
 27:22/0 = 0
 28:22/0 = 0
@@ -3065,14 +2904,10 @@ texture = ExtResource("5_q7rhw")
 2:23/0 = 0
 3:23/0 = 0
 17:23/0 = 0
-17:23/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 19:23/0 = 0
-19:23/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 22:23/0 = 0
 23:23/0 = 0
-23:23/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 25:23/0 = 0
-25:23/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 26:23/0 = 0
 27:23/0 = 0
 28:23/0 = 0
@@ -3095,20 +2930,14 @@ texture = ExtResource("5_q7rhw")
 45:23/0 = 0
 47:23/0 = 0
 17:24/0 = 0
-17:24/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 18:24/0 = 0
-18:24/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 19:24/0 = 0
-19:24/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 20:24/0 = 0
 21:24/0 = 0
 22:24/0 = 0
 23:24/0 = 0
-23:24/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 24:24/0 = 0
-24:24/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 25:24/0 = 0
-25:24/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 26:24/0 = 0
 27:24/0 = 0
 28:24/0 = 0
@@ -3132,23 +2961,14 @@ texture = ExtResource("5_q7rhw")
 46:24/0 = 0
 47:24/0 = 0
 17:25/0 = 0
-17:25/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 18:25/0 = 0
-18:25/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 19:25/0 = 0
-19:25/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 20:25/0 = 0
-20:25/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 21:25/0 = 0
-21:25/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 22:25/0 = 0
-22:25/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 23:25/0 = 0
-23:25/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 24:25/0 = 0
-24:25/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 25:25/0 = 0
-25:25/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 26:25/0 = 0
 27:25/0 = 0
 28:25/0 = 0
@@ -3172,21 +2992,13 @@ texture = ExtResource("5_q7rhw")
 46:25/0 = 0
 47:25/0 = 0
 17:26/0 = 0
-17:26/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 18:26/0 = 0
-18:26/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 19:26/0 = 0
-19:26/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 20:26/0 = 0
-20:26/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 21:26/0 = 0
-21:26/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 22:26/0 = 0
-22:26/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 23:26/0 = 0
-23:26/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 25:26/0 = 0
-25:26/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 26:26/0 = 0
 27:26/0 = 0
 28:26/0 = 0
@@ -3210,23 +3022,14 @@ texture = ExtResource("5_q7rhw")
 46:26/0 = 0
 47:26/0 = 0
 17:27/0 = 0
-17:27/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 18:27/0 = 0
-18:27/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 19:27/0 = 0
-19:27/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 20:27/0 = 0
-20:27/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 21:27/0 = 0
-21:27/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 22:27/0 = 0
-22:27/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 23:27/0 = 0
-23:27/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 24:27/0 = 0
-24:27/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 25:27/0 = 0
-25:27/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 26:27/0 = 0
 27:27/0 = 0
 28:27/0 = 0

scenes/level_village_3.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=34 format=4 uid="uid://h60obxmju6mo"]
+[gd_scene load_steps=33 format=4 uid="uid://h60obxmju6mo"]
 
 [ext_resource type="PackedScene" uid="uid://dyp4i4ru2j2jh" path="res://objects/fxs/explosion_fx.tscn" id="1_p30ax"]
 [ext_resource type="PackedScene" uid="uid://dx80ivlvuuew4" path="res://objects/fxs/fire_fx.tscn" id="2_a7yjf"]
@@ -23,7 +23,6 @@
 [ext_resource type="PackedScene" uid="uid://bqom4cm7r18db" path="res://objects/entities/killzone.tscn" id="21_p30ax"]
 [ext_resource type="PackedScene" uid="uid://12jnkdygpxwc" path="res://objects/entities/exit_level.tscn" id="22_a7yjf"]
 [ext_resource type="PackedScene" uid="uid://t6h2ra7kjyq" path="res://objects/entities/small_heal_potion.tscn" id="23_m6h4x"]
-[ext_resource type="PackedScene" uid="uid://dk2cu8qs7odib" path="res://objects/entities/double_jump_skill_pickup.tscn" id="24_6fdf4"]
 
 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_j7bvy"]
 texture = ExtResource("7_uvxky")
@@ -301,7 +300,7 @@ z_index = 5
 position = Vector2(903, -118)
 metadata/_edit_group_ = true
 
-[node name="HitParticles" parent="Brick Player" index="23"]
+[node name="HitParticles" parent="Brick Player" index="24"]
 process_material = SubResource("ParticleProcessMaterial_lgb3u")
 
 [node name="Camera2D" parent="." instance=ExtResource("12_qhkyq")]
@@ -365,9 +364,6 @@ position = Vector2(1359, -42)
 [node name="Killzone" parent="." instance=ExtResource("21_p30ax")]
 position = Vector2(2456, 815)
 
-[node name="SkillPickup" parent="." instance=ExtResource("24_6fdf4")]
-position = Vector2(1136, -109)
-
 [connection signal="Death" from="Brick Player/HealthComponent" to="UI Layer/DeathScreen" method="OnPlayerDeath"]
 [connection signal="Death" from="Brick Player/HealthComponent" to="UI Layer/GameOverScreen" method="OnPlayerDeath"]
 

scenes/main_menu.tscn

@@ -1,12 +1,10 @@
-[gd_scene load_steps=8 format=3 uid="uid://cl00e2ocomk3m"]
+[gd_scene load_steps=6 format=3 uid="uid://cl00e2ocomk3m"]
 
 [ext_resource type="PackedScene" uid="uid://8b6ol5sssbgo" path="res://objects/ui/main_menu.tscn" id="1_ekxnf"]
 [ext_resource type="PackedScene" uid="uid://y0ae6e7t70fj" path="res://objects/ui/settings_menu.tscn" id="2_bqqt6"]
 [ext_resource type="PackedScene" uid="uid://bwgmrcyj4mvu" path="res://objects/ui/credits.tscn" id="3_bqqt6"]
 [ext_resource type="PackedScene" uid="uid://b5fx1vdfky307" path="res://objects/ui/audio_settings.tscn" id="4_8ln24"]
 [ext_resource type="PackedScene" uid="uid://cvfsbiy5ggrpg" path="res://objects/ui/input_settings.tscn" id="5_rtw2f"]
-[ext_resource type="PackedScene" uid="uid://display_settings_scene" path="res://objects/ui/display_settings.tscn" id="6_dispset"]
-[ext_resource type="PackedScene" uid="uid://gameplay_settings_scene" path="res://objects/ui/gameplay_settings.tscn" id="7_gameplay"]
 
 [node name="Main menu" type="CanvasLayer"]
 
@@ -30,8 +28,14 @@ visible = false
 [node name="Input Settings" parent="." instance=ExtResource("5_rtw2f")]
 visible = false
 
-[node name="Gameplay Settings" parent="." instance=ExtResource("7_gameplay")]
+[node name="Gameplay Settings" type="Control" parent="."]
-visible = false
+layout_mode = 3
+anchors_preset = 0
+offset_right = 40.0
+offset_bottom = 40.0
 
-[node name="Display Settings" parent="." instance=ExtResource("6_dispset")]
+[node name="Display Settings" type="Control" parent="."]
-visible = false
+layout_mode = 3
+anchors_preset = 0
+offset_right = 40.0
+offset_bottom = 40.0

scripts/Events/GhostEventHandler.cs

@@ -7,30 +7,25 @@ namespace Mr.BrickAdventures.scripts.Events;
 [GlobalClass]
 public partial class GhostEventHandler : Node
 {
+    private GhostManager _ghostManager;
+
     public override void _Ready()
     {
+        _ghostManager = GetNode<GhostManager>(Constants.GhostManagerPath);
+
         EventBus.Instance.LevelStarted += OnLevelStarted;
         EventBus.Instance.LevelCompleted += OnLevelCompleted;
     }
 
-    public override void _ExitTree()
-    {
-        if (EventBus.Instance != null)
-        {
-            EventBus.Instance.LevelStarted -= OnLevelStarted;
-            EventBus.Instance.LevelCompleted -= OnLevelCompleted;
-        }
-    }
-
     private void OnLevelStarted(int levelIndex, Node currentScene)
     {
         GD.Print($"GhostEventHandler: Level {levelIndex} started.");
-        GhostManager.Instance.StartRecording(levelIndex);
+        _ghostManager.StartRecording(levelIndex);
-        GhostManager.Instance.SpawnGhostPlayer(levelIndex, currentScene);
+        _ghostManager.SpawnGhostPlayer(levelIndex, currentScene);
     }
 
     private void OnLevelCompleted(int levelIndex, Node currentScene, double completionTime)
     {
-        GhostManager.Instance.StopRecording(true, completionTime);
+        _ghostManager.StopRecording(true, completionTime);
     }
 }

scripts/Events/LevelStateHandler.cs

@@ -0,0 +1,39 @@
+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)
+    {
+        var store = GameStateStore.Instance;
+        if (store == null) return;
+
+        // Mark level complete and unlock next
+        store.MarkLevelComplete(levelIndex);
+
+        // Commit session data to persistent state
+        store.CommitSessionCoins();
+        store.CommitSessionSkills();
+
+        // Reset session for next level
+        store.ResetSession();
+    }
+}

scripts/Events/LevelStateHandler.cs.uid

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

scripts/Events/SkillCollectHandler.cs

@@ -1,41 +0,0 @@
-using Godot;
-using Mr.BrickAdventures.Autoloads;
-using Mr.BrickAdventures.scripts.Resources;
-
-namespace Mr.BrickAdventures.scripts.Events;
-
-/// <summary>
-/// Handles skill collection events and unlocks skills via GameStateStore.
-/// Skills are immediately activated but only persisted on level complete.
-/// </summary>
-public partial class SkillCollectHandler : Node
-{
-    private SkillManager SkillManager => SkillManager.Instance;
-
-    public override void _Ready()
-    {
-        EventBus.Instance.SkillCollected += OnSkillCollected;
-    }
-
-    public override void _ExitTree()
-    {
-        if (EventBus.Instance != null)
-        {
-            EventBus.Instance.SkillCollected -= OnSkillCollected;
-        }
-    }
-
-    private void OnSkillCollected(SkillData skill, Vector2 position)
-    {
-        if (skill == null) return;
-
-        // Unlock in session (will be committed on level complete, lost on death)
-        GameStateStore.Instance?.UnlockSkillInSession(skill);
-
-        // Immediately activate the skill for the player
-        SkillManager?.AddSkill(skill);
-
-        // Emit skill unlocked event for UI/achievements
-        EventBus.EmitSkillUnlocked(skill.Name, skill.Level);
-    }
-}

scripts/Events/SkillCollectHandler.cs.uid

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

scripts/Events/SpeedRunEventHandler.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 
 namespace Mr.BrickAdventures.scripts.Events;
@@ -6,19 +7,17 @@ namespace Mr.BrickAdventures.scripts.Events;
 [GlobalClass]
 public partial class SpeedRunEventHandler : Node
 {
+    private SpeedRunManager _speedRunManager;
+
     public override void _Ready()
     {
-        EventBus.Instance.LevelCompleted += OnLevelCompleted;
+        _speedRunManager = GetNode<SpeedRunManager>(Constants.SpeedRunManagerPath);
-    }
 
-    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)
     {
-        SpeedRunManager.Instance?.Split();
+        _speedRunManager.Split();
     }
 }

scripts/Events/StatisticsEventHandler.cs

@@ -1,16 +1,22 @@
 using Godot;
+using Mr.BrickAdventures;
 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;
+
     public override void _Ready()
     {
+        _statisticsManager = GetNode<StatisticsManager>(Constants.StatisticsManagerPath);
+
+        // Subscribe to events
         EventBus.Instance.CoinCollected += OnCoinCollected;
         EventBus.Instance.EnemyDefeated += OnEnemyDefeated;
         EventBus.Instance.PlayerDied += OnPlayerDied;
@@ -30,17 +36,27 @@ public partial class StatisticsEventHandler : Node
     }
 
     private void OnCoinCollected(int amount, Vector2 position)
-        => GameStateStore.Instance?.IncrementStat(StatNames.CoinsCollected, amount);
+    {
+        _statisticsManager.IncrementStat("coins_collected", amount);
+    }
 
     private void OnEnemyDefeated(Node enemy, Vector2 position)
-        => GameStateStore.Instance?.IncrementStat(StatNames.EnemiesDefeated);
+    {
+        _statisticsManager.IncrementStat("enemies_defeated");
+    }
 
     private void OnPlayerDied(Vector2 position)
-        => GameStateStore.Instance?.IncrementStat(StatNames.Deaths);
+    {
+        _statisticsManager.IncrementStat("deaths");
+    }
 
     private void OnLevelCompleted(int levelIndex, Node currentScene, double completionTime)
-        => GameStateStore.Instance?.IncrementStat(StatNames.LevelsCompleted);
+    {
+        _statisticsManager.IncrementStat("levels_completed");
+    }
 
     private void OnChildRescued(Vector2 position)
-        => GameStateStore.Instance?.IncrementStat(StatNames.ChildrenRescued);
+    {
+        _statisticsManager.IncrementStat("children_rescued");
+    }
 }

scripts/PacXonLevel.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using Godot;
 using Mr.BrickAdventures.scripts.components;
-using Mr.BrickAdventures.scripts.Resources;
 
 namespace Mr.BrickAdventures.scripts;
 
@@ -9,17 +8,17 @@ namespace Mr.BrickAdventures.scripts;
 public partial class PacXonLevel : Node
 {
     [Export] public PlayerController Player { get; set; }
-    [Export] public MovementPreset GridPreset { get; set; }
     [Export] public PacXonGridManager GridManager { get; set; }
     [Export] public Node GhostContainer { get; set; }
     [Export] public Label PercentageLabel { get; set; }
-
+    
     private const float WinPercentage = 0.90f;
 
     public override void _Ready()
     {
         var ghosts = GhostContainer.GetChildren().OfType<Node2D>().ToList();
-        Player.ApplyPreset(GridPreset);
+        Player.ClearMovementAbilities();
+        Player.SetGridMovement();
         
         foreach (var ghost in ghosts)
         {

scripts/Resources/CollectableResource.cs

@@ -6,9 +6,4 @@ public partial class CollectableResource : Resource
 {
     [Export] public float Amount { get; set; } = 0.0f;
     [Export] public CollectableType Type { get; set; }
-
-    /// <summary>
-    /// The skill to unlock when collected. Only used when Type is Skill.
-    /// </summary>
-    [Export] public SkillData Skill { get; set; }
 }

scripts/Resources/CollectableType.cs

@@ -2,9 +2,7 @@ namespace Mr.BrickAdventures.scripts.Resources;
 
 public enum CollectableType
 {
-    None, // when no collectable type is specified
     Coin,
     Kid,
     Health,
-    Skill,
 }

scripts/Resources/MovementPreset.cs

@@ -1,9 +0,0 @@
-using Godot;
-
-namespace Mr.BrickAdventures.scripts.Resources;
-
-[GlobalClass]
-public partial class MovementPreset : Resource
-{
-    [Export] public PackedScene[] Abilities { get; set; } = [];
-}

scripts/Resources/MovementPreset.cs.uid

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

scripts/Resources/SkillData.cs

@@ -10,10 +10,11 @@ public partial class SkillData : Resource
     [Export] public string Name { get; set; } = "New Skill";
     [Export] public string Description { get; set; } = "New Skill";
     [Export] public Texture2D Icon { get; set; }
+    [Export] public bool IsActive { get; set; } = false;
     [Export] public int Level { get; set; } = 1;
     [Export] public SkillType Type { get; set; } = SkillType.Throw;
     [Export] public PackedScene Node { get; set; }
     [Export] public Array<SkillUpgrade> Upgrades { get; set; } = [];
-
+    
     public int MaxLevel => Upgrades.Count;
 }

scripts/State/GhostSaveData.cs

@@ -1,16 +0,0 @@
-using System.Collections.Generic;
-
-namespace Mr.BrickAdventures.scripts.State;
-
-public class GhostSaveData
-{
-    public double BestTime { get; set; }
-    public List<GhostFrameDto> Frames { get; set; } = new();
-}
-
-public class GhostFrameDto
-{
-    public double Timestamp { get; set; }
-    public float X { get; set; }
-    public float Y { get; set; }
-}

scripts/State/GhostSaveData.cs.uid

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

scripts/State/PlayerState.cs

@@ -9,13 +9,6 @@ namespace Mr.BrickAdventures.scripts.State;
 /// </summary>
 public class PlayerState
 {
-    private const int DefaultLives = 3;
-
-    /// <summary>
-    /// The level index the player is currently on. Persisted across sessions.
-    /// </summary>
-    public int CurrentLevel { get; set; }
-
     /// <summary>
     /// Saved coins (not including current session).
     /// </summary>
@@ -24,7 +17,7 @@ public class PlayerState
     /// <summary>
     /// Remaining lives.
     /// </summary>
-    public int Lives { get; set; } = DefaultLives;
+    public int Lives { get; set; } = 3;
 
     /// <summary>
     /// Indices of completed levels.
@@ -52,18 +45,25 @@ public class PlayerState
     public List<string> UnlockedAchievements { get; set; } = new();
 
     /// <summary>
-    /// Creates a fresh default player state (same as <c>new PlayerState()</c>).
+    /// Creates a fresh default player state.
     /// </summary>
-    public static PlayerState CreateDefault() => new();
+    public static PlayerState CreateDefault() => new()
+    {
+        Coins = 0,
+        Lives = 3,
+        CompletedLevels = new List<int>(),
+        UnlockedLevels = new List<int> { 0 },
+        UnlockedSkills = new List<SkillData>(),
+        Statistics = new Dictionary<string, int>()
+    };
 
     /// <summary>
     /// Resets this state to default values.
     /// </summary>
     public void Reset()
     {
-        CurrentLevel = 0;
         Coins = 0;
-        Lives = DefaultLives;
+        Lives = 3;
         CompletedLevels.Clear();
         UnlockedLevels.Clear();
         UnlockedLevels.Add(0);

scripts/State/SaveDataDto.cs

@@ -1,19 +0,0 @@
-using System.Collections.Generic;
-
-namespace Mr.BrickAdventures.scripts.State;
-
-/// <summary>
-/// Serializable DTO for save data - no Godot types.
-/// </summary>
-public class SaveDataDto
-{
-    public int Version { get; set; }
-    public int Coins { get; set; }
-    public int Lives { get; set; }
-    public int CurrentLevel { get; set; }
-    public List<int> CompletedLevels { get; set; }
-    public List<int> UnlockedLevels { get; set; }
-    public List<string> UnlockedSkillNames { get; set; }
-    public List<string> UnlockedAchievements { get; set; }
-    public Dictionary<string, int> Statistics { get; set; }
-}

scripts/State/SaveDataDto.cs.uid

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

scripts/State/SessionState.cs

@@ -9,6 +9,11 @@ namespace Mr.BrickAdventures.scripts.State;
 /// </summary>
 public class SessionState
 {
+    /// <summary>
+    /// Current level index being played.
+    /// </summary>
+    public int CurrentLevel { get; set; }
+
     /// <summary>
     /// Coins collected during this session (not yet saved).
     /// </summary>
@@ -24,6 +29,7 @@ public class SessionState
     /// </summary>
     public static SessionState CreateDefault() => new()
     {
+        CurrentLevel = 0,
         CoinsCollected = 0,
         SkillsUnlocked = new List<SkillData>()
     };
@@ -38,10 +44,11 @@ public class SessionState
     }
 
     /// <summary>
-    /// Resets all session state.
+    /// Resets completely including level.
     /// </summary>
     public void ResetAll()
     {
+        CurrentLevel = 0;
         CoinsCollected = 0;
         SkillsUnlocked.Clear();
     }

scripts/State/StatNames.cs

@@ -1,10 +0,0 @@
-namespace Mr.BrickAdventures.scripts.State;
-
-public static class StatNames
-{
-    public const string CoinsCollected = "coins_collected";
-    public const string EnemiesDefeated = "enemies_defeated";
-    public const string Deaths = "deaths";
-    public const string LevelsCompleted = "levels_completed";
-    public const string ChildrenRescued = "children_rescued";
-}

scripts/State/StatNames.cs.uid

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

scripts/UI/AudioSettings.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 
 namespace Mr.BrickAdventures.scripts.UI;
@@ -11,57 +12,33 @@ public partial class AudioSettings : Control
     [Export] public Control AudioSettingsControl { get; set; }
     [Export] public float MuteThreshold { get; set; } = -20f;
 
-    private UIManager UIManager => UIManager.Instance;
+    private UIManager _uiManager;
-    private ConfigFileHandler ConfigFileHandler => ConfigFileHandler.Instance;
+    private ConfigFileHandler _configFileHandler;
 
     public override void _Ready()
     {
-        MasterVolumeSlider.FocusMode = Control.FocusModeEnum.All;
+        _uiManager = GetNode<UIManager>(Constants.UIManagerPath);
-        MusicVolumeSlider.FocusMode = Control.FocusModeEnum.All;
+        _configFileHandler = GetNode<ConfigFileHandler>(Constants.ConfigFileHandlerPath);
-        SfxVolumeSlider.FocusMode = Control.FocusModeEnum.All;
-
         Initialize();
         MasterVolumeSlider.ValueChanged += OnMasterVolumeChanged;
         MusicVolumeSlider.ValueChanged += OnMusicVolumeChanged;
         SfxVolumeSlider.ValueChanged += OnSfxVolumeChanged;
 
         LoadSettings();
-
-        if (InputDeviceManager.Instance != null)
-            InputDeviceManager.Instance.DeviceChanged += OnDeviceChanged;
-        AudioSettingsControl.VisibilityChanged += OnVisibilityChanged;
     }
 
     public override void _ExitTree()
     {
-        if (InputDeviceManager.Instance != null)
-            InputDeviceManager.Instance.DeviceChanged -= OnDeviceChanged;
-        AudioSettingsControl.VisibilityChanged -= OnVisibilityChanged;
         SaveSettings();
     }
 
-    private void OnVisibilityChanged()
-    {
-        if (AudioSettingsControl.IsVisibleInTree() && InputDeviceManager.Instance?.IsPointerless == true)
-            GrabFirstFocus();
-    }
-
-    private void OnDeviceChanged(int device)
-    {
-        var d = (InputDeviceManager.InputDevice)device;
-        if (d != InputDeviceManager.InputDevice.Mouse && AudioSettingsControl.IsVisibleInTree())
-            GrabFirstFocus();
-    }
-
-    private void GrabFirstFocus() => MasterVolumeSlider.GrabFocus();
-
     public override void _UnhandledInput(InputEvent @event)
     {
         if (!@event.IsActionReleased("ui_cancel")) return;
-        if (!UIManager.IsScreenOnTop(AudioSettingsControl)) return;
+        if (!_uiManager.IsScreenOnTop(AudioSettingsControl)) return;
 
         SaveSettings();
-        UIManager.PopScreen();
+        _uiManager.PopScreen();
     }
 
     private void OnSfxVolumeChanged(double value)
@@ -107,7 +84,7 @@ public partial class AudioSettings : Control
 
     private void SaveSettings()
     {
-        var settingsConfig = ConfigFileHandler.SettingsConfig;
+        var settingsConfig = _configFileHandler.SettingsConfig;
         settingsConfig.SetValue("audio_settings", "master_volume", MasterVolumeSlider.Value);
         settingsConfig.SetValue("audio_settings", "music_volume", MusicVolumeSlider.Value);
         settingsConfig.SetValue("audio_settings", "sfx_volume", SfxVolumeSlider.Value);
@@ -117,7 +94,7 @@ public partial class AudioSettings : Control
 
     private void LoadSettings()
     {
-        var settingsConfig = ConfigFileHandler.SettingsConfig;
+        var settingsConfig = _configFileHandler.SettingsConfig;
         if (!settingsConfig.HasSection("audio_settings")) return;
 
         var masterVolume = (float)settingsConfig.GetValue("audio_settings", "master_volume", MasterVolumeSlider.Value);

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 = SkillManager.Instance;
+        _skillManager = GetNodeOrNull<SkillManager>(Constants.SkillManagerPath);
         if (_skillManager == null)
         {
             GD.PrintErr("ChargeProgressBar: SkillManager autoload not found.");

scripts/UI/Credits.cs

@@ -1,18 +1,24 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 
 namespace Mr.BrickAdventures.scripts.UI;
 
 public partial class Credits : Control
 {
-    private UIManager UIManager => UIManager.Instance;
+    private UIManager _uiManager;
+
+    public override void _Ready()
+    {
+        _uiManager = GetNode<UIManager>(Constants.UIManagerPath);
+    }
 
     public override void _UnhandledInput(InputEvent @event)
     {
         if (!@event.IsActionPressed("ui_cancel")) return;
-        if (UIManager != null && UIManager.IsScreenOnTop(this))
+        if (_uiManager != null && _uiManager.IsScreenOnTop(this))
         {
-            UIManager.PopScreen();
+            _uiManager.PopScreen();
         }
     }
 }

scripts/UI/DeathScreen.cs

@@ -1,4 +1,5 @@
 using Godot;
+using Mr.BrickAdventures;
 using Mr.BrickAdventures.Autoloads;
 using Mr.BrickAdventures.scripts.Resources;
 using Mr.BrickAdventures.scripts.State;
@@ -14,11 +15,13 @@ public partial class DeathScreen : Control
     [Export] public float TimeoutTime { get; set; } = 2.0f;
     [Export] public Godot.Collections.Array<Node> NodesToDisable { get; set; } = new();
 
-    private GameManager GameManager => GameManager.Instance;
+    private GameManager _gameManager;
     private Timer _timer;
 
     public override void _Ready()
     {
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
+
         // Subscribe to lives changed event for reactive updates
         EventBus.Instance.LivesChanged += OnLivesChanged;
     }
@@ -71,7 +74,7 @@ public partial class DeathScreen : Control
 
     public void OnPlayerDeath()
     {
-        if (GameManager == null) return;
+        if (_gameManager == null) return;
 
         ToggleNodes();
         SetLabels();

scripts/UI/DisplaySettings.cs

@@ -1,125 +0,0 @@
-using Godot;
-using Mr.BrickAdventures.Autoloads;
-
-namespace Mr.BrickAdventures.scripts.UI;
-
-public partial class DisplaySettings : Control
-{
-    [Export] public OptionButton WindowModeButton { get; set; }
-    [Export] public OptionButton ResolutionButton { get; set; }
-    [Export] public Control DisplaySettingsControl { get; set; }
-
-    private UIManager UIManager => UIManager.Instance;
-
-    public override void _Ready()
-    {
-        PopulateWindowMode();
-        PopulateResolutions();
-
-        WindowModeButton.ItemSelected += OnWindowModeChanged;
-        ResolutionButton.ItemSelected += OnResolutionChanged;
-
-        WindowModeButton.FocusMode = Control.FocusModeEnum.All;
-        ResolutionButton.FocusMode = Control.FocusModeEnum.All;
-
-        LoadSettings();
-
-        if (InputDeviceManager.Instance != null)
-            InputDeviceManager.Instance.DeviceChanged += OnDeviceChanged;
-        DisplaySettingsControl.VisibilityChanged += OnVisibilityChanged;
-    }
-
-    public override void _ExitTree()
-    {
-        if (InputDeviceManager.Instance != null)
-            InputDeviceManager.Instance.DeviceChanged -= OnDeviceChanged;
-        DisplaySettingsControl.VisibilityChanged -= OnVisibilityChanged;
-        SettingsManager.Instance?.SaveDisplaySettings();
-    }
-
-    public override void _UnhandledInput(InputEvent @event)
-    {
-        if (!@event.IsActionReleased("ui_cancel")) return;
-        if (!UIManager.IsScreenOnTop(DisplaySettingsControl)) return;
-
-        SettingsManager.Instance?.SaveDisplaySettings();
-        UIManager.PopScreen();
-    }
-
-    private void OnVisibilityChanged()
-    {
-        if (DisplaySettingsControl.IsVisibleInTree() && InputDeviceManager.Instance?.IsPointerless == true)
-            GrabFirstFocus();
-    }
-
-    private void OnDeviceChanged(int device)
-    {
-        var d = (InputDeviceManager.InputDevice)device;
-        if (d != InputDeviceManager.InputDevice.Mouse && DisplaySettingsControl.IsVisibleInTree())
-            GrabFirstFocus();
-    }
-
-    private void GrabFirstFocus() => WindowModeButton.GrabFocus();
-
-    private void PopulateWindowMode()
-    {
-        WindowModeButton.Clear();
-        WindowModeButton.AddItem("Fullscreen", 0);
-        WindowModeButton.AddItem("Borderless", 1);
-        WindowModeButton.AddItem("Windowed", 2);
-    }
-
-    private void PopulateResolutions()
-    {
-        ResolutionButton.Clear();
-        foreach (var res in SettingsManager.Instance.GetAllResolutions())
-        {
-            string label = $"{res.X}×{res.Y}";
-            ResolutionButton.AddItem(label);
-        }
-    }
-
-    private void OnWindowModeChanged(long idx)
-    {
-        string mode = idx switch
-        {
-            0 => "fullscreen",
-            1 => "borderless",
-            _ => "windowed"
-        };
-
-        SettingsManager.Instance.WindowMode = mode;
-        SettingsManager.Instance.ApplyDisplaySettings();
-        ResolutionButton.Disabled = mode == "fullscreen";
-        SettingsManager.Instance.SaveDisplaySettings();
-    }
-
-    private void OnResolutionChanged(long idx)
-    {
-        var resolutions = SettingsManager.Instance.GetAllResolutions();
-        if (idx < 0 || idx >= resolutions.Count) return;
-
-        var res = resolutions[(int)idx];
-        SettingsManager.Instance.Resolution = res;
-        SettingsManager.Instance.ApplyDisplaySettings();
-        SettingsManager.Instance.SaveDisplaySettings();
-    }
-
-    private void LoadSettings()
-    {
-        var mode = SettingsManager.Instance.WindowMode;
-        WindowModeButton.Selected = mode switch
-        {
-            "fullscreen" => 0,
-            "borderless" => 1,
-            _ => 2
-        };
-        ResolutionButton.Disabled = mode == "fullscreen";
-
-        var resolution = SettingsManager.Instance.Resolution;
-        var resolutions = SettingsManager.Instance.GetAllResolutions();
-        int resIdx = resolutions.IndexOf(resolution);
-        if (resIdx >= 0)
-            ResolutionButton.Selected = resIdx;
-    }
-}

scripts/UI/DisplaySettings.cs.uid

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

scripts/UI/GameOverScreen.cs

@@ -11,48 +11,30 @@ public partial class GameOverScreen : Control
     [Export] public Button MainMenuButton { get; set; }
     [Export] public PackedScene MainMenuScene { get; set; }
 
+    private GameManager _gameManager;
+
     public override void _Ready()
     {
-        RestartButton.FocusMode = Control.FocusModeEnum.All;
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
-        MainMenuButton.FocusMode = Control.FocusModeEnum.All;
-
         RestartButton.Pressed += OnRestartClicked;
         MainMenuButton.Pressed += OnMainMenuClicked;
-
-        if (InputDeviceManager.Instance != null)
-            InputDeviceManager.Instance.DeviceChanged += OnDeviceChanged;
-    }
-
-    public override void _ExitTree()
-    {
-        if (InputDeviceManager.Instance != null)
-            InputDeviceManager.Instance.DeviceChanged -= OnDeviceChanged;
-    }
-
-    private void OnDeviceChanged(int device)
-    {
-        var d = (InputDeviceManager.InputDevice)device;
-        if (d != InputDeviceManager.InputDevice.Mouse && GameOverPanel.IsVisibleInTree())
-            RestartButton.GrabFocus();
     }
 
     private void OnMainMenuClicked()
     {
-        GameStateStore.Instance?.ResetAll();
+        _gameManager.ResetPlayerState();
         GetTree().ChangeSceneToPacked(MainMenuScene);
     }
 
     private void OnRestartClicked()
     {
-        GameManager.Instance?.RestartGame();
+        _gameManager.RestartGame();
     }
 
     public void OnPlayerDeath()
     {
-        if (GameStateStore.Instance?.Player.Lives != 0) return;
+        if (_gameManager == null || _gameManager.GetLives() != 0) return;
 
         GameOverPanel.Show();
-        if (InputDeviceManager.Instance?.IsPointerless == true)
-            RestartButton.GrabFocus();
     }
 }

scripts/UI/GameplaySettings.cs

@@ -1,97 +0,0 @@
-using Godot;
-using Mr.BrickAdventures.Autoloads;
-
-namespace Mr.BrickAdventures.scripts.UI;
-
-public partial class GameplaySettings : Control
-{
-    [Export] public HSlider DeadzoneSlider { get; set; }
-    [Export] public Label DeadzoneValueLabel { get; set; }
-    [Export] public HSlider SensitivitySlider { get; set; }
-    [Export] public Label SensitivityValueLabel { get; set; }
-    [Export] public Control GameplaySettingsControl { get; set; }
-
-    private UIManager UIManager => UIManager.Instance;
-
-    public override void _Ready()
-    {
-        DeadzoneSlider.FocusMode = Control.FocusModeEnum.All;
-        SensitivitySlider.FocusMode = Control.FocusModeEnum.All;
-
-        DeadzoneSlider.MinValue = 0.05;
-        DeadzoneSlider.MaxValue = 0.5;
-        DeadzoneSlider.Step = 0.05;
-        DeadzoneSlider.Value = 0.2;
-
-        SensitivitySlider.MinValue = 0.5;
-        SensitivitySlider.MaxValue = 2.0;
-        SensitivitySlider.Step = 0.1;
-        SensitivitySlider.Value = 1.0;
-
-        LoadSettings();
-
-        DeadzoneSlider.ValueChanged += OnDeadzoneChanged;
-        SensitivitySlider.ValueChanged += OnSensitivityChanged;
-
-        if (InputDeviceManager.Instance != null)
-            InputDeviceManager.Instance.DeviceChanged += OnDeviceChanged;
-        GameplaySettingsControl.VisibilityChanged += OnVisibilityChanged;
-    }
-
-    public override void _ExitTree()
-    {
-        if (InputDeviceManager.Instance != null)
-            InputDeviceManager.Instance.DeviceChanged -= OnDeviceChanged;
-        GameplaySettingsControl.VisibilityChanged -= OnVisibilityChanged;
-        SaveSettings();
-    }
-
-    public override void _UnhandledInput(InputEvent @event)
-    {
-        if (!@event.IsActionReleased("ui_cancel")) return;
-        if (!UIManager.IsScreenOnTop(GameplaySettingsControl)) return;
-
-        SaveSettings();
-        UIManager.PopScreen();
-    }
-
-    private void OnVisibilityChanged()
-    {
-        if (GameplaySettingsControl.IsVisibleInTree() && InputDeviceManager.Instance?.IsPointerless == true)
-            GrabFirstFocus();
-    }
-
-    private void OnDeviceChanged(int device)
-    {
-        var d = (InputDeviceManager.InputDevice)device;
-        if (d != InputDeviceManager.InputDevice.Mouse && GameplaySettingsControl.IsVisibleInTree())
-            GrabFirstFocus();
-    }
-
-    private void GrabFirstFocus() => DeadzoneSlider.GrabFocus();
-
-    private void OnDeadzoneChanged(double value)
-    {
-        SettingsManager.Instance.GamepadDeadzone = (float)value;
-        SettingsManager.Instance.ApplyGamepadDeadzone();
-        DeadzoneValueLabel.Text = $"{value:F2}";
-        SaveSettings();
-    }
-
-    private void OnSensitivityChanged(double value)
-    {
-        SettingsManager.Instance.GamepadSensitivity = (float)value;
-        SensitivityValueLabel.Text = $"{value:F2}";
-        SaveSettings();
-    }
-
-    private void LoadSettings()
-    {
-        DeadzoneSlider.Value = SettingsManager.Instance.GamepadDeadzone;
-        SensitivitySlider.Value = SettingsManager.Instance.GamepadSensitivity;
-        DeadzoneValueLabel.Text = $"{SettingsManager.Instance.GamepadDeadzone:F2}";
-        SensitivityValueLabel.Text = $"{SettingsManager.Instance.GamepadSensitivity:F2}";
-    }
-
-    private void SaveSettings() => SettingsManager.Instance.SaveGameplaySettings();
-}

scripts/UI/GameplaySettings.cs.uid

@@ -1 +0,0 @@
-uid://18e3imrmq1u6