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

Autoloads/ConsoleManager.cs

@@ -13,9 +13,9 @@ public partial class ConsoleManager : Node
 
     public override void _Ready()
     {
-        _gameManager = GameManager.Instance;
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
         _achievementManager = GetNode<AchievementManager>(Constants.AchievementManagerPath);
-        _skillManager = SkillManager.Instance;
+        _skillManager = GetNode<SkillManager>(Constants.SkillManagerPath);
     }
 
     private void AddCoinsCommand(int amount)

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

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;
@@ -16,18 +14,6 @@ public partial class FloatingTextManager : Node
     [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);
@@ -36,7 +22,7 @@ public partial class FloatingTextManager : Node
     
     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);
     }
 

Autoloads/GameManager.cs

@@ -30,8 +30,6 @@ public partial class GameManager : Node
     /// </summary>
     private GameStateStore Store => GameStateStore.Instance;
 
-    public static GameManager Instance { get; private set; }
-
     public override void _EnterTree()
     {
         GetTree().NodeAdded += OnNodeAdded;
@@ -40,7 +38,6 @@ public partial class GameManager : Node
 
     public override void _ExitTree()
     {
-        if (Instance == this) Instance = null;
         GetTree().NodeAdded -= OnNodeAdded;
         GetTree().NodeRemoved -= OnNodeRemoved;
         _sceneNodes.Clear();
@@ -48,7 +45,6 @@ public partial class GameManager : Node
 
     public override void _Ready()
     {
-        Instance = this;
         _speedRunManager = GetNode<SpeedRunManager>(Constants.SpeedRunManagerPath);
     }
 
@@ -144,9 +140,11 @@ public partial class GameManager : Node
     {
         if (Store == null) return new Array<SkillData>();
 
-        var skills = Store.GetAllUnlockedSkills();
         var result = new Array<SkillData>();
-        foreach (var s in skills) result.Add(s);
+        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;
     }
 

Autoloads/GameStateStore.cs

@@ -1,5 +1,4 @@
 using Godot;
-using System.Collections.Generic;
 using Mr.BrickAdventures.scripts.Resources;
 using Mr.BrickAdventures.scripts.State;
 
@@ -164,19 +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 Reset Operations

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()
     {
         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;

Autoloads/SkillManager.cs

@@ -18,8 +18,6 @@ public partial class SkillManager : Node
 
     public Dictionary ActiveComponents { get; private set; } = new();
 
-    public static SkillManager Instance { get; private set; }
-
     [Signal]
     public delegate void ActiveThrowSkillChangedEventHandler(BrickThrowComponent throwComponent);
     [Signal]
@@ -27,15 +25,9 @@ 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>
     /// Called by the PlayerController from its _Ready method to register itself with the manager.
     /// </summary>
@@ -151,6 +143,7 @@ public partial class SkillManager : Node
         {
             if (s.Name == skillName)
             {
+                s.IsActive = false;
                 break;
             }
         }
@@ -195,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;
         }
     }
 
@@ -213,6 +202,7 @@ public partial class SkillManager : Node
         if (ActiveComponents.ContainsKey(skill.Name))
         {
             RemoveSkill(skill.Name);
+            skill.IsActive = false;
         }
     }
 

Mr. Brick Adventures.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/4.6.0">
+<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/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/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/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/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 load_steps=12 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"]
 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")])

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"
 
@@ -39,13 +35,13 @@ UIManager="*res://Autoloads/UIManager.cs"
 ConfigFileHandler="*res://Autoloads/ConfigFileHandler.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"
@@ -53,7 +49,6 @@ 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/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"]
 

scripts/Events/SkillCollectHandler.cs

@@ -1,43 +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;
-
-    public override void _Ready()
-    {
-        _skillManager = SkillManager.Instance;
-        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
-        skill.Level = 1;
-        _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/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/SkillData.cs

@@ -10,6 +10,7 @@ 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; }

scripts/UI/DeathScreen.cs

@@ -20,7 +20,7 @@ public partial class DeathScreen : Control
 
     public override void _Ready()
     {
-        _gameManager = GameManager.Instance;
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
 
         // Subscribe to lives changed event for reactive updates
         EventBus.Instance.LivesChanged += OnLivesChanged;

scripts/UI/GameOverScreen.cs

@@ -15,7 +15,7 @@ public partial class GameOverScreen : Control
 
     public override void _Ready()
     {
-        _gameManager = GameManager.Instance;
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
         RestartButton.Pressed += OnRestartClicked;
         MainMenuButton.Pressed += OnMainMenuClicked;
     }

scripts/UI/Hud.cs

@@ -16,7 +16,7 @@ public partial class Hud : Control
 
     public override void _Ready()
     {
-        _gameManager = GameManager.Instance;
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
     }
 
     public override void _Process(double delta)

scripts/UI/MainMenu.cs

@@ -22,8 +22,8 @@ public partial class MainMenu : Control
 
     public override void _Ready()
     {
-        _saveSystem = SaveSystem.Instance;
+        _saveSystem = GetNode<SaveSystem>(Constants.SaveSystemPath);
-        _gameManager = GameManager.Instance;
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
         _uiManager = GetNode<UIManager>(Constants.UIManagerPath);
 
         NewGameButton.Pressed += OnNewGamePressed;

scripts/UI/Marketplace.cs

@@ -26,8 +26,9 @@ public partial class Marketplace : Control
 
     public override void _Ready()
     {
-        _gameManager = GameManager.Instance;
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
-        _skillManager = SkillManager.Instance;
+        _skillManager = GetNode<SkillManager>(Constants.SkillManagerPath);
+        _skillManager.SkillRemoved += OnSkillRemoved;
 
         Skills = _skillManager.AvailableSkills;
 
@@ -41,16 +42,11 @@ public partial class Marketplace : Control
         foreach (var skill in unlockedSkills) CreateSkillButton(skill);
 
         SkillUnlockerComponent.SkillUnlocked += OnSkillUnlocked;
-        EventBus.Instance.SkillCollected += OnGlobalSkillCollected;
     }
 
     public override void _ExitTree()
     {
         SkillUnlockerComponent.SkillUnlocked -= OnSkillUnlocked;
-        if (EventBus.Instance != null)
-        {
-            EventBus.Instance.SkillCollected -= OnGlobalSkillCollected;
-        }
     }
 
     public override void _Input(InputEvent @event)
@@ -85,7 +81,7 @@ public partial class Marketplace : Control
 
         foreach (var btn in _skillButtons)
         {
-            if (_skillManager.IsSkillActive(btn.Data)) btn.Activate();
+            if (btn.Data.IsActive) btn.Activate();
             else btn.Deactivate();
         }
     }
@@ -122,7 +118,7 @@ public partial class Marketplace : Control
             if (skill.Level < skill.MaxLevel)
             {
                 SkillUnlockerComponent.TryUpgradeSkill(skill);
-                if (!SkillUnlockerComponent.SkillManager.IsSkillActive(skill)) SkillUnlockerComponent.SkillManager.ToggleSkillActivation(skill);
+                if (!skill.IsActive) SkillUnlockerComponent.SkillManager.ToggleSkillActivation(skill);
             }
             else
             {
@@ -141,15 +137,28 @@ public partial class Marketplace : Control
 
         foreach (var btn in _skillButtons)
         {
-            if (SkillUnlockerComponent.SkillManager.IsSkillActive(btn.Data))
+            if (btn.Data.IsActive)
                 btn.Activate();
             else
                 btn.Deactivate();
         }
     }
 
-    private void OnGlobalSkillCollected(SkillData skill, Vector2 position)
+    private void OnSkillRemoved(SkillData skill)
     {
-        OnSkillUnlocked(skill);
+        SkillButton buttonToRemove = null;
+        foreach (var button in _skillButtons)
+        {
+            if (button.Data == skill)
+            {
+                buttonToRemove = button;
+                break;
+            }
+        }
+        if (buttonToRemove != null)
+        {
+            _skillButtons.Remove(buttonToRemove);
+            buttonToRemove.QueueFree();
+        }
     }
 }

scripts/UI/MarketplaceButton.cs

@@ -19,7 +19,7 @@ public partial class MarketplaceButton : Button
 
     public override void _Ready()
     {
-        _gameManager = GameManager.Instance;
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
         var player = _gameManager.Player;
         if (player == null) return;
 
@@ -29,7 +29,7 @@ public partial class MarketplaceButton : Button
             _skillUnlockerComponent.SkillUnlocked += OnSkillStateChanged;
         }
 
-        _skillManager = SkillManager.Instance;
+        _skillManager = GetNode<SkillManager>(Constants.SkillManagerPath);
         _skillManager.SkillRemoved += OnSkillStateChanged;
 
         UpdateButtonState();

scripts/UI/PauseMenu.cs

@@ -19,7 +19,7 @@ public partial class PauseMenu : Control
 
     public override void _Ready()
     {
-        _gameManager = GameManager.Instance;
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
         _uiManager = GetNode<UIManager>(Constants.UIManagerPath);
 
         ResumeButton.Pressed += OnResumePressed;

scripts/components/BrickArmorSkillComponent.cs

@@ -5,27 +5,26 @@ using Mr.BrickAdventures.scripts.Resources;
 namespace Mr.BrickAdventures.scripts.components;
 
 [GlobalClass]
-public partial class BrickArmorSkillComponent : SkillComponentBase
+public partial class BrickArmorSkillComponent : Node, ISkill
 {
     private HealthComponent _healthComponent;
+    private SkillData _skillData;
     private float _armorBonus = 0;
     
-    public override void Initialize(Node owner, SkillData data)
+    public void Initialize(Node owner, SkillData data)
     {
-        base.Initialize(owner, data);
+        if (owner is not PlayerController player) return;
-        if (Player != null)
+        _healthComponent = player.GetNode<HealthComponent>("HealthComponent");
-        {
+        _skillData = data;
-            _healthComponent = Player.GetNode<HealthComponent>("HealthComponent");
-        }
     }
 
-    public override void Activate()
+    public void Activate()
     {
-        if (_healthComponent == null || Data == null) return;
+        if (_healthComponent == null || _skillData == null) return;
-        ApplyUpgrade(Data.Upgrades[Data.Level - 1]);
+        ApplyUpgrade(_skillData.Upgrades[_skillData.Level - 1]);
     }
 
-    public override void Deactivate()
+    public void Deactivate()
     {
         if (_healthComponent == null) return;
         _healthComponent.MaxHealth -= _armorBonus;
@@ -36,7 +35,7 @@ public partial class BrickArmorSkillComponent : SkillComponentBase
         _armorBonus = 0;
     }
 
-    public override void ApplyUpgrade(SkillUpgrade upgrade)
+    public void ApplyUpgrade(SkillUpgrade upgrade)
     {
         if (_healthComponent == null || upgrade == null) return;
 

scripts/components/BrickShieldSkillComponent.cs

@@ -7,33 +7,41 @@ using Mr.BrickAdventures.scripts.Resources;
 namespace Mr.BrickAdventures.scripts.components;
 
 [GlobalClass]
-public partial class BrickShieldSkillComponent : SkillComponentBase
+public partial class BrickShieldSkillComponent : Node, ISkill
 {
     [Export] public PackedScene ShieldScene { get; set; }
 
+    private PlayerController _player;
     private Node2D _shieldInstance;
+    private SkillData _skillData;
     private GameManager _gameManager;
     private SkillManager _skillManager;
     private HealthComponent _shieldHealth;
 
     public override void _Ready()
     {
-        _gameManager = GameManager.Instance;
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
-        _skillManager = SkillManager.Instance;
+        _skillManager = GetNode<SkillManager>(Constants.SkillManagerPath);
     }
 
-    public override void Activate()
+    public void Initialize(Node owner, SkillData data)
     {
-        if (Player == null || ShieldScene == null || _shieldInstance != null) return;
+        _player = owner as PlayerController;
+        _skillData = data;
+    }
+
+    public void Activate()
+    {
+        if (_player == null || ShieldScene == null || _shieldInstance != null) return;
 
         _shieldInstance = ShieldScene.Instantiate<Node2D>();
-        Player.AddChild(_shieldInstance);
+        _player.AddChild(_shieldInstance);
         _shieldInstance.Position = Vector2.Zero;
         _shieldInstance.TreeExiting += OnShieldDestroyed;
         _shieldHealth = _shieldInstance.GetNode<HealthComponent>("HealthComponent");
     }
 
-    public override void Deactivate()
+    public void Deactivate()
     {
         if (_shieldInstance != null && IsInstanceValid(_shieldInstance))
         {
@@ -43,7 +51,7 @@ public partial class BrickShieldSkillComponent : SkillComponentBase
         _shieldInstance = null;
     }
 
-    public override void ApplyUpgrade(SkillUpgrade upgrade)
+    public void ApplyUpgrade(SkillUpgrade upgrade)
     {
         upgrade.Properties.TryGetValue("shield_health", out var newHealth);
         if (_shieldHealth != null)
@@ -55,10 +63,10 @@ public partial class BrickShieldSkillComponent : SkillComponentBase
 
     private void OnShieldDestroyed()
     {
-        if (_gameManager != null && Data != null && _skillManager != null)
+        if (_gameManager != null && _skillData != null && _skillManager != null)
         {
-            _gameManager.RemoveSkill(Data.Name);
+            _gameManager.RemoveSkill(_skillData.Name);
-            _skillManager.RemoveSkill(Data.Name);
+            _skillManager.RemoveSkill(_skillData.Name);
         }
         _shieldInstance = null;
     }

scripts/components/BrickThrowComponent.cs

@@ -5,14 +5,16 @@ using Mr.BrickAdventures.scripts.Resources;
 namespace Mr.BrickAdventures.scripts.components;
 
 [GlobalClass]
-public partial class BrickThrowComponent : SkillComponentBase
+public partial class BrickThrowComponent : Node, ISkill
 {
     [Export] public PackedScene BrickScene { get; set; }
     [Export] public float FireRate { get; set; } = 1.0f;
+    [Export] public PlayerController PlayerController { get; set; }
     [Export] public ThrowInputResource ThrowInputBehavior { get; set; }
     
     private bool _canThrow = true;
     private Timer _timer;
+    private SkillData _skillData;
 
     public override void _Ready()
     {
@@ -57,7 +59,7 @@ public partial class BrickThrowComponent : SkillComponentBase
 
     private void ThrowBrick(float powerMultiplier = 1f)
     {
-        if (!_canThrow || Player == null || BrickScene == null)
+        if (!_canThrow || PlayerController == null || BrickScene == null)
             return;
 
         var instance = BrickScene.Instantiate<Node2D>();
@@ -67,9 +69,9 @@ public partial class BrickThrowComponent : SkillComponentBase
         {
             var @params = new ProjectileInitParams()
             {
-                Position = Player.GlobalPosition,
+                Position = PlayerController.GlobalPosition,
-                Rotation = Player.Rotation,
+                Rotation = PlayerController.Rotation,
-                Direction = Player.LastDirection,
+                Direction = PlayerController.LastDirection,
                 PowerMultiplier = powerMultiplier,
             };
             
@@ -81,30 +83,36 @@ public partial class BrickThrowComponent : SkillComponentBase
         _timer.Start();
     }
 
-    public override void Initialize(Node owner, SkillData data)
+    public void Initialize(Node owner, SkillData data)
     {
-        base.Initialize(owner, data);
+        PlayerController = owner as PlayerController;
+        _skillData = data;
 
         ThrowInputBehavior = (ThrowInputResource)ThrowInputBehavior?.Duplicate();
 
-        if (Data.Level > 0 && Data.Upgrades.Count >= Data.Level)
+        if (PlayerController == null)
         {
-            ApplyUpgrade(Data.Upgrades[Data.Level - 1]);
+            GD.PushError("BrickThrowComponent: Owner is not a PlayerController.");
+        }
+        
+        if (_skillData.Level > 0 && _skillData.Upgrades.Count >= _skillData.Level)
+        {
+            ApplyUpgrade(_skillData.Upgrades[_skillData.Level - 1]);
         }
     }
 
-    public override void Activate()
+    public void Activate()
     {
         if (ThrowInputBehavior != null) ThrowInputBehavior.ThrowRequested += ThrowBrick;
         SetProcessInput(true);
     }
 
-    public override void Deactivate()
+    public void Deactivate()
     {
         if (ThrowInputBehavior != null) ThrowInputBehavior.ThrowRequested -= ThrowBrick;
     }
 
-    public override void ApplyUpgrade(SkillUpgrade upgrade)
+    public void ApplyUpgrade(SkillUpgrade upgrade)
     {
         foreach (var property in upgrade.Properties)
         {

scripts/components/CollectableComponent.cs

@@ -24,6 +24,8 @@ public partial class CollectableComponent : Node
     /// </summary>
     public Func<Node2D, bool> CanCollect { get; set; }
 
+    private FloatingTextManager _floatingTextManager;
+
     public override void _Ready()
     {
         if (Area2D != null)
@@ -33,6 +35,8 @@ public partial class CollectableComponent : Node
 
         if (Owner.HasNode("FadeAwayComponent"))
             _hasFadeAway = true;
+
+        _floatingTextManager = GetNode<FloatingTextManager>(Constants.FloatingTextManagerPath);
     }
 
     private async void OnArea2DBodyEntered(Node2D body)
@@ -49,24 +53,17 @@ public partial class CollectableComponent : Node
                 switch (Data.Type)
                 {
                     case CollectableType.Coin:
-                        FloatingTextManager.Instance?.ShowCoin((int)Data.Amount, ownerNode.GlobalPosition);
+                        _floatingTextManager?.ShowCoin((int)Data.Amount, ownerNode.GlobalPosition);
                         EventBus.EmitCoinCollected((int)Data.Amount, ownerNode.GlobalPosition);
                         break;
                     case CollectableType.Health:
-                        FloatingTextManager.Instance?.ShowMessage("Healed!", ownerNode.GlobalPosition);
+                        _floatingTextManager?.ShowMessage("Healed!", ownerNode.GlobalPosition);
                         EventBus.EmitItemCollected(Data.Type, Data.Amount, ownerNode.GlobalPosition);
                         break;
                     case CollectableType.Kid:
-                        FloatingTextManager.Instance?.ShowMessage("Rescued!", ownerNode.GlobalPosition);
+                        _floatingTextManager?.ShowMessage("Rescued!", ownerNode.GlobalPosition);
                         EventBus.EmitChildRescued(ownerNode.GlobalPosition);
                         break;
-                    case CollectableType.Skill:
-                        if (Data.Skill != null)
-                        {
-                            FloatingTextManager.Instance?.ShowMessage($"{Data.Skill.Name} Unlocked!", ownerNode.GlobalPosition);
-                            EventBus.EmitSkillCollected(Data.Skill, ownerNode.GlobalPosition);
-                        }
-                        break;
                     default:
                         EventBus.EmitItemCollected(Data.Type, Data.Amount, ownerNode.GlobalPosition);
                         break;

scripts/components/DoubleJumpSkillComponent.cs

@@ -6,25 +6,40 @@ using Mr.BrickAdventures.scripts.Resources;
 namespace Mr.BrickAdventures.scripts.components;
 
 [GlobalClass]
-public partial class DoubleJumpSkillComponent : SkillComponentBase
+public partial class DoubleJumpSkillComponent : Node, ISkill
 {
     [Export] private PackedScene _doubleJumpAbilityScene;
+    private PlayerController _playerController;
     
-    public override void Activate()
+    public void Initialize(Node owner, SkillData data)
     {
-        if (Player == null) return;
+        _playerController = owner as PlayerController;
+        if (_playerController == null)
+        {
+            GD.PrintErr("DoubleJumpSkillComponent must be a child of a PlayerController.");
+        }
+    }
 
-        var hasAbility = Player.GetActiveAbilities().Any(ability => ability is DoubleJumpAbility);
+    public void Activate()
+    {
+        if (_playerController == null) return;
+
+        var hasAbility = _playerController.GetActiveAbilities().Any(ability => ability is DoubleJumpAbility);
 
         if (!hasAbility)
         {
             var abilityInstance = _doubleJumpAbilityScene.Instantiate<DoubleJumpAbility>();
-            Player.AddAbility(abilityInstance);
+            _playerController.AddAbility(abilityInstance);
         }
     }
 
-    public override void Deactivate()
+    public void Deactivate()
     {
-        Player?.RemoveAbility<DoubleJumpAbility>();
+        _playerController?.RemoveAbility<DoubleJumpAbility>();
+    }
+
+    public void ApplyUpgrade(SkillUpgrade upgrade)
+    {
+        
     }
 }

scripts/components/ExitDoorComponent.cs

@@ -22,7 +22,7 @@ public partial class ExitDoorComponent : Area2D, IUnlockable
 
     public override void _Ready()
     {
-        _gameManager = GameManager.Instance;
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
         _achievementManager = GetNode<AchievementManager>(Constants.AchievementManagerPath);
 
         BodyEntered += OnExitAreaBodyEntered;

scripts/components/GroundPoundSkillComponent.cs

@@ -5,59 +5,62 @@ using Mr.BrickAdventures.scripts.Resources;
 namespace Mr.BrickAdventures.scripts.components;
 
 [GlobalClass]
-public partial class GroundPoundSkillComponent : SkillComponentBase
+public partial class GroundPoundSkillComponent : Node, ISkill
 {
     [Export] public float PoundForce { get; set; } = 1200f;
     [Export] public PackedScene ShockwaveScene { get; set; }
     
+    private PlayerController _player;
     private PlayerInputHandler _input;
     private bool _isPounding = false;
     
-    public override void Initialize(Node owner, SkillData data)
+    public void Initialize(Node owner, SkillData data)
     {
-        base.Initialize(owner, data);
+        _player = owner as PlayerController;
-        if (Player != null)
+        if (_player != null)
         {
-            _input = Player.GetNode<PlayerInputHandler>("PlayerInputHandler");
+            _input = _player.GetNode<PlayerInputHandler>("PlayerInputHandler");
         }
     }
 
     public override void _PhysicsProcess(double delta)
     {
-        if (Player == null || _input == null)
+        if (_player == null || _input == null)
         {
             return;
         }
         
         // Check if we just landed from a ground pound to create the shockwave.
-        if (_isPounding && Player.IsOnFloor())
+        if (_isPounding && _player.IsOnFloor())
         {
             _isPounding = false;
             if (ShockwaveScene != null)
             {
                 var shockwave = ShockwaveScene.Instantiate<Node2D>();
-                Player.GetParent()?.AddChild(shockwave);
+                _player.GetParent()?.AddChild(shockwave);
-                shockwave.GlobalPosition = Player.GlobalPosition;
+                shockwave.GlobalPosition = _player.GlobalPosition;
             }
         }
 
         // Check to initiate a ground pound. The player must be in the air.
-        if (_input.DownHeld && !Player.IsOnFloor() && !_isPounding)
+        if (_input.DownHeld && !_player.IsOnFloor() && !_isPounding)
         {
             // Apply a strong downward force, zeroing out horizontal movement.
-            Player.Velocity = new Vector2(0, PoundForce);
+            _player.Velocity = new Vector2(0, PoundForce);
             _isPounding = true;
         }
     }
     
-    public override void Activate()
+    public void Activate() 
     {
         SetPhysicsProcess(true);
     }
     
-    public override void Deactivate()
+    public void Deactivate() 
     {
         SetPhysicsProcess(false);
         _isPounding = false;
     }
+
+    public void ApplyUpgrade(SkillUpgrade upgrade) { }
 }

scripts/components/MagneticSkillComponent.cs

@@ -7,12 +7,14 @@ using Mr.BrickAdventures.scripts.Resources;
 namespace Mr.BrickAdventures.scripts.components;
 
 [GlobalClass]
-public partial class MagneticSkillComponent : SkillComponentBase
+public partial class MagneticSkillComponent : Node, ISkill
 {
     [Export] public Area2D MagneticArea { get; set; }
     [Export] public float MagneticMoveDuration { get; set; } = 1.25f;
 
     private Array<Node2D> _collectablesToPickUp = [];
+    private Node2D _owner;
+    private SkillData _skillData;
 
     public override void _Process(double delta)
     {
@@ -63,21 +65,22 @@ public partial class MagneticSkillComponent : SkillComponentBase
 
     private void MoveCollectableToOwner(Node2D collectable)
     {
-        if (!IsInstanceValid(collectable) || !IsInstanceValid(Player)) return;
+        if (!IsInstanceValid(collectable) || !IsInstanceValid(_owner)) return;
         
-        var direction = (Player.GlobalPosition - collectable.GlobalPosition).Normalized();
+        var direction = (_owner.GlobalPosition - collectable.GlobalPosition).Normalized();
         var speed = direction.Length() / MagneticMoveDuration;
 
         collectable.GlobalPosition += direction.Normalized() * speed;
     }
 
-    public override void Initialize(Node owner, SkillData data)
+    public void Initialize(Node owner, SkillData data)
     {
-        base.Initialize(owner, data);
+        _owner = owner as Node2D;
+        _skillData = data;
         
-        if (Player == null)
+        if (_owner == null)
         {
-            GD.PushWarning("MagneticSkillComponent: Owner is not a Player/Node2D.");
+            GD.PushWarning("MagneticSkillComponent: Owner is not a Node2D.");
         }
 
         if (MagneticArea == null)
@@ -94,13 +97,13 @@ public partial class MagneticSkillComponent : SkillComponentBase
             }
         }
         
-        if (Data.Level > 0 && Data.Upgrades.Count >= Data.Level)
+        if (_skillData.Level > 0 && _skillData.Upgrades.Count >= _skillData.Level)
         {
-            ApplyUpgrade(Data.Upgrades[Data.Level - 1]);
+            ApplyUpgrade(_skillData.Upgrades[_skillData.Level - 1]);
         }
     }
 
-    public override void Activate()
+    public void Activate()
     {
         if (MagneticArea == null)
         {
@@ -112,7 +115,7 @@ public partial class MagneticSkillComponent : SkillComponentBase
         MagneticArea.AreaEntered += OnAreaEntered;
     }
 
-    public override void Deactivate()
+    public void Deactivate()
     {
         if (MagneticArea == null) return;
         
@@ -120,7 +123,7 @@ public partial class MagneticSkillComponent : SkillComponentBase
         MagneticArea.AreaEntered -= OnAreaEntered;
     }
 
-    public override void ApplyUpgrade(SkillUpgrade upgrade)
+    public void ApplyUpgrade(SkillUpgrade upgrade)
     {
         foreach (var property in upgrade.Properties)
         {

scripts/components/PlayerDeathComponent.cs

@@ -16,7 +16,7 @@ public partial class PlayerDeathComponent : Node2D
 
     public override void _Ready()
     {
-        _gameManager = GameManager.Instance;
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
         HealthComponent.Death += OnDeath;
     }
 

scripts/components/RequirementComponent.cs

@@ -18,11 +18,6 @@ public partial class RequirementComponent : Node
 
     public override void _Ready()
     {
-        if (RequirementType == CollectableType.None)
-        {
-            EmitSignalRequirementMet(RequirementType);
-        }
-        
         var collectables = GetTree().GetNodesInGroup(CollectableGroupName);
         foreach (var collectable in collectables)
         {

scripts/components/SkillComponentBase.cs

@@ -1,29 +0,0 @@
-using Godot;
-using Mr.BrickAdventures.scripts.interfaces;
-using Mr.BrickAdventures.scripts.Resources;
-
-namespace Mr.BrickAdventures.scripts.components;
-
-/// <summary>
-/// Base class for all skill components to reduce boilerplate.
-/// </summary>
-public abstract partial class SkillComponentBase : Node, ISkill
-{
-    protected PlayerController Player { get; private set; }
-    protected SkillData Data { get; private set; }
-
-    public virtual void Initialize(Node owner, SkillData data)
-    {
-        Player = owner as PlayerController;
-        Data = data;
-
-        if (Player == null)
-        {
-            GD.PrintErr($"{GetType().Name} must be a child of a PlayerController.");
-        }
-    }
-
-    public abstract void Activate();
-    public abstract void Deactivate();
-    public virtual void ApplyUpgrade(SkillUpgrade upgrade) { }
-}

scripts/components/SkillComponentBase.cs.uid

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

scripts/components/SkillUnlockerComponent.cs

@@ -20,8 +20,8 @@ public partial class SkillUnlockerComponent : Node
 
     public override void _Ready()
     {
-        _gameManager = GameManager.Instance;
+        _gameManager = GetNode<GameManager>(Constants.GameManagerPath);
-        SkillManager = SkillManager.Instance;
+        SkillManager = GetNode<SkillManager>(Constants.SkillManagerPath);
     }
 
     private bool HasEnoughCoins(int amount)
@@ -36,6 +36,7 @@ public partial class SkillUnlockerComponent : Node
         if (!HasEnoughCoins(skill.Upgrades[0].Cost)) return false;
 
         skill.Level = 1;
+        skill.IsActive = true;
         _gameManager.RemoveCoins(skill.Upgrades[0].Cost);
 
         // Add to session state via GameStateStore

scripts/components/UnlockOnRequirementComponent.cs

@@ -13,11 +13,6 @@ public partial class UnlockOnRequirementComponent : Node
     public override void _Ready()
     {
         RequirementComponent.RequirementMet += OnRequirementMet;
-
-        if (RequirementComponent.RequirementType == CollectableType.None)
-        {
-            OnRequirementMet(RequirementComponent.RequirementType);
-        }
     }
 
     private void OnRequirementMet(CollectableType requirementType)

scripts/components/XRayVisionSkillComponent.cs

@@ -5,7 +5,7 @@ using Mr.BrickAdventures.scripts.Resources;
 namespace Mr.BrickAdventures.scripts.components;
 
 [GlobalClass]
-public partial class XRayVisionSkillComponent : SkillComponentBase
+public partial class XRayVisionSkillComponent : Node, ISkill
 {
     [Export(PropertyHint.Layers2DRender)] public uint SecretLayer { get; set; }
     [Export] public float Duration { get; set; } = 5.0f;
@@ -15,9 +15,8 @@ public partial class XRayVisionSkillComponent : SkillComponentBase
     private uint _originalVisibilityLayer;
     private Timer _timer;
     
-    public override void Initialize(Node owner, SkillData data)
+    public void Initialize(Node owner, SkillData data)
     {
-        base.Initialize(owner, data);
         _viewport = GetViewport();
         _camera = GetViewport().GetCamera2D();
         _timer = new Timer { OneShot = true };
@@ -25,7 +24,7 @@ public partial class XRayVisionSkillComponent : SkillComponentBase
         _timer.Timeout += Deactivate;
     }
 
-    public override void Activate()
+    public void Activate()
     {
         if (_camera == null) return;
         
@@ -34,7 +33,7 @@ public partial class XRayVisionSkillComponent : SkillComponentBase
         _timer.Start(Duration);
     }
 
-    public override void Deactivate()
+    public void Deactivate()
     {
         if (_camera != null)
         {
@@ -42,7 +41,7 @@ public partial class XRayVisionSkillComponent : SkillComponentBase
         }
     }
 
-    public override void ApplyUpgrade(SkillUpgrade upgrade)
+    public void ApplyUpgrade(SkillUpgrade upgrade)
     {
         if (upgrade.Properties.TryGetValue("duration", out var newDuration))
         {

shaders/hit_flash.tres

@@ -1,4 +1,4 @@
-[gd_resource type="VisualShader" format=3 uid="uid://bs4xvm4qkurpr"]
+[gd_resource type="VisualShader" load_steps=5 format=3 uid="uid://bs4xvm4qkurpr"]
 
 [sub_resource type="VisualShaderNodeColorParameter" id="VisualShaderNodeColorParameter_m0j3m"]
 parameter_name = "tint"
@@ -15,6 +15,51 @@ default_input_values = [0, 0.0, 1, 1.0, 2, 1e-05, 3, Vector3(0, 0, 0), 4, Vector
 input_name = "color"
 
 [resource]
+code = "shader_type canvas_item;
+render_mode blend_mix;
+
+uniform bool enabled = false;
+uniform vec4 tint : source_color = vec4(1.000000, 1.000000, 1.000000, 1.000000);
+
+
+
+void fragment() {
+// BooleanParameter:3
+	bool n_out3p0 = enabled;
+
+
+// ColorParameter:2
+	vec4 n_out2p0 = tint;
+
+
+// Input:5
+	vec4 n_out5p0 = COLOR;
+
+
+	vec3 n_out4p0;
+// If:4
+	float n_in4p1 = 1.00000;
+	float n_in4p2 = 0.00001;
+	if(abs((n_out3p0 ? 1.0 : 0.0) - n_in4p1) < n_in4p2)
+	{
+		n_out4p0 = vec3(n_out2p0.xyz);
+	}
+	else if((n_out3p0 ? 1.0 : 0.0) < n_in4p1)
+	{
+		n_out4p0 = vec3(n_out5p0.xyz);
+	}
+	else
+	{
+		n_out4p0 = vec3(n_out5p0.xyz);
+	}
+
+
+// Output:0
+	COLOR.rgb = n_out4p0;
+
+
+}
+"
 mode = 1
 flags/light_only = false
 nodes/fragment/0/position = Vector2(740, 560)