Update resource files and add new tileset; remove inactive properties and upgrade paths

Add FallOnDetectionComponent and CleanupOnCollisionComponent; implement falling detection and cleanup on collision
2025-10-13 21:09:05 +02:00 · 2025-09-13 22:04:36 +02:00
36 changed files with 5688 additions and 224 deletions
--- a/Autoloads/ConsoleManager.cs
+++ b/Autoloads/ConsoleManager.cs
@@ -1,6 +1,4 @@
 using Godot;
-using Limbo.Console.Sharp;
-using Mr.BrickAdventures.scripts;
 using Mr.BrickAdventures.scripts.components;

 namespace Mr.BrickAdventures.Autoloads;
@@ -17,66 +15,42 @@ public partial class ConsoleManager : Node
        _gameManager = GetNode<GameManager>("/root/GameManager");
        _achievementManager = GetNode<AchievementManager>("/root/AchievementManager");
        _skillManager = GetNode<SkillManager>("/root/SkillManager");
-
-        RegisterConsoleCommands();
    }

-    public override void _ExitTree()
-    {
-        UnregisterConsoleCommands();
-    }
-
-    [ConsoleCommand("add_coins", "Adds a specified amount of coins to the player's total.")]
    private void AddCoinsCommand(int amount)
    {
        _gameManager.AddCoins(amount);
-        LimboConsole.Info($"Increased coins by {amount}. Total coins: {_gameManager.GetCoins()}");
    }

-    [ConsoleCommand("set_coins", "Sets the player's total coins to a specified amount.")]
    private void SetCoinsCommand(int amount)
    {
        _gameManager.SetCoins(amount);
-        LimboConsole.Info($"Set coins to {amount}. Total coins: {_gameManager.GetCoins()}");
    }

-    [ConsoleCommand("set_lives", "Sets the player's total lives to a specified amount.")]
    private void SetLivesCommand(int amount)
    {
        _gameManager.SetLives(amount);
-        LimboConsole.Info($"Set lives to {amount}.");
    }

-    [ConsoleCommand("add_lives", "Adds a specified amount of lives to the player's total.")]
    private void AddLivesCommand(int amount)
    {
        _gameManager.AddLives(amount);
-        LimboConsole.Info($"Increased lives by {amount}. Total lives: {_gameManager.GetLives()}");
    }

-    [ConsoleCommand("set_health", "Sets the player's health to a specified amount.")]
    private void SetHealthCommand(float amount)
    {
        var playerHealthComponent = _gameManager.Player.GetNode<HealthComponent>("HealthComponent");
        if (playerHealthComponent != null)
        {
            playerHealthComponent.Health = amount;
-            LimboConsole.Info($"Set player health to {amount}.");
-        }
-        else
-        {
-            LimboConsole.Warn("Player HealthComponent not found.");
        }
    }

-    [ConsoleCommand("reset_session", "Resets the current session state.")]
    private void ResetSessionCommand()
    {
        _gameManager.ResetCurrentSessionState();
-        LimboConsole.Info("Current session state has been reset.");
    }

-    [ConsoleCommand("unlock_skill", "Unlocks and activates a skill by its name.")]
    private void UnlockSkillCommand(string skillName)
    {
        if (!GetSkillManagement()) return;
@@ -84,14 +58,12 @@ public partial class ConsoleManager : Node
        var skill = _skillManager.GetSkillByName(skillName);
        if (skill == null)
        {
-            LimboConsole.Warn($"Skill '{skillName}' not found.");
            return;
        }

        _gameManager.UnlockSkill(skill);
        _skillManager.ActivateSkill(skill);
        _skillUnlockerComponent.EmitSignal(SkillUnlockerComponent.SignalName.SkillUnlocked, skill);
-        LimboConsole.Info($"Skill '{skillName}' has been unlocked and activated.");
    }

    private bool GetSkillManagement()
@@ -99,7 +71,6 @@ public partial class ConsoleManager : Node
        var player = _gameManager.Player;
        if (player == null || !IsInstanceValid(player))
        {
-            LimboConsole.Warn("Player node not found or is invalid.");
            return false;
        }

@@ -107,21 +78,17 @@ public partial class ConsoleManager : Node

        if (_skillManager != null && _skillUnlockerComponent != null) return true;

-        LimboConsole.Warn("SkillManager or SkillUnlockerComponent not found on the player.");
        return false;

    }

-    [ConsoleCommand("unlock_all_skills", "Unlocks and activates all available skills.")]
    private void UnlockAllSkillsCommand()
    {
        if (!GetSkillManagement()) return;

        _skillUnlockerComponent.UnlockAllSkills();
-        LimboConsole.Info("All skills have been unlocked and activated.");
    }
    
-    [ConsoleCommand("remove_skill", "Deactivates and removes a skill by its name.")]
    private void RemoveSkillCommand(string skillName)
    {
        if (!GetSkillManagement()) return;
@@ -129,16 +96,13 @@ public partial class ConsoleManager : Node
        var skill = _skillManager.GetSkillByName(skillName);
        if (skill == null)
        {
-            LimboConsole.Warn($"Skill '{skillName}' not found.");
            return;
        }

        _gameManager.RemoveSkill(skill.Name);
        _skillManager.DeactivateSkill(skill);
-        LimboConsole.Info($"Skill '{skillName}' has been deactivated.");
    }
    
-    [ConsoleCommand("remove_all_skills", "Deactivates and removes all skills.")]
    private void RemoveAllSkillsCommand()
    {
        if (!GetSkillManagement()) return;
@@ -148,23 +112,18 @@ public partial class ConsoleManager : Node
            _gameManager.RemoveSkill(skill.Name);
            _skillManager.DeactivateSkill(skill);
        }
-        LimboConsole.Info("All skills have been deactivated.");
    }
    
-    [ConsoleCommand("next_level", "Advances the game to the next level.")]
    private void GoToNextLevelCommand()
    {
        _gameManager.OnLevelComplete();
    }
    
-    [ConsoleCommand("unlock_achievement", "Unlocks an achievement by its ID.")]
    private void UnlockAchievementCommand(string achievementId)
    {
        _achievementManager.UnlockAchievement(achievementId);
-        LimboConsole.Info($"Attempted to unlock achievement '{achievementId}'.");
    }
    
-    [ConsoleCommand("reset_achievement", "Resets (locks) an achievement by its ID.")]
    private void ResetAchievementCommand(string achievementId)
    {
        _achievementManager.LockAchievement(achievementId);
--- a/Adventures.csproj
+++ b/Adventures.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/4.4.1">
+<Project Sdk="Godot.NET.Sdk/4.5.0">
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <EnableDynamicLoading>true</EnableDynamicLoading>
@@ -8,6 +8,5 @@
    <PackageReference Include="Facepunch.Steamworks" Version="2.3.3" />
    <PackageReference Include="Facepunch.Steamworks.Dlls" Version="2.3.2" />
    <PackageReference Include="Facepunch.Steamworks.Library" Version="2.3.3" />
-    <PackageReference Include="LimboConsole.Sharp" Version="0.0.1-beta-008" />
  </ItemGroup>
 </Project>
--- a/Adventures.sln.DotSettings.user
+++ b/Adventures.sln.DotSettings.user
@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AArea2D_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FSourcesCache_003F116d8c5f8dae51522ba398e1d89e3d4722f4af7b6e7f071196b928be44af7_003FArea2D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACamera2D_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FSourcesCache_003Fa2e12a1a67ad701a97608de6be85250e3e353951ecf8058a02c703490c753_003FCamera2D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACanvasItem_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Fef7b819b226fab796d1dfe66d415dd7510bcac87675020ddb8f03a828e763_003FCanvasItem_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACecovym_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003Ftmp_003FJetBrainsPerUserTemp_002D1000_002D1_003FSandboxFiles_003FSadijuw_003FCecovym_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -10,5 +11,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FSourcesCache_003Fe747192abb38e2df82cbdb37e721567726f559914a7b81f8b26ba537de632f4_003FList_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMr_002EBrickAdventures_002Escripts_002Ecomponents_002ECollectableComponent_005FScriptSignals_002Egenerated_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FSourcesCache_003F80d9408eb7280c15eb4a12b61cdf8f7f1b0c5a2_003FMr_002EBrickAdventures_002Escripts_002Ecomponents_002ECollectableComponent_005FScriptSignals_002Egenerated_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANode2D_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F86db9cd834346aad02d74c1b66dd9c64d6ef3147435dd9c9c9477b48f7_003FNode2D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APhysicsBody2D_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FSourcesCache_003F4fcd28ddaffa68e6fe53288161b788dea7d402b4a41b9d9f0f0f2c52f9af075_003FPhysicsBody2D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ARectangleShape2D_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Fa1cc98873548652da0c14ecefa4737431426fcbb24a7f0641e3d9c266c3_003FRectangleShape2D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ARigidBody2D_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FSourcesCache_003F7bc3ccc1ac5bbc68933d64c7b7eb5ab4aecde2b73c686dd6495b68bdf08ba5b2_003FRigidBody2D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AShape2D_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F3671dbbd9b17cdf2bf9075b468b6bd7e3ab13fc3be7a116484085d3b6cc9fe_003FShape2D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
--- a/objects/entities/cannon_bullet.tscn
+++ b/objects/entities/cannon_bullet.tscn
@@ -15,7 +15,7 @@ radius = 4.0

 [node name="Bullet" type="Area2D"]
 collision_layer = 64
-collision_mask = 21
+collision_mask = 85

 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource("CircleShape2D_txsw8")
@@ -47,7 +47,7 @@ VisibilityNotifier = NodePath("../VisibleOnScreenNotifier2D")

 [node name="LifetimeComponent" type="Node" parent="."]
 script = ExtResource("4_aniyw")
-LifeTime = 10.0
+LifeTime = 3.0

 [node name="LaunchComponent" type="Node2D" parent="."]
 script = ExtResource("5_3ks47")
--- a/objects/entities/cannon_down.tscn
+++ b/objects/entities/cannon_down.tscn
@@ -0,0 +1,48 @@
+[gd_scene load_steps=7 format=3 uid="uid://qrbiu1qo4tt5"]
+
+[ext_resource type="Texture2D" uid="uid://djifxc5x0dyrw" path="res://sprites/ppc_tileset.png" id="1_0efvn"]
+[ext_resource type="Script" uid="uid://bnaxy8cw3wrko" path="res://scripts/components/PeriodicShootingComponent.cs" id="2_4ycs1"]
+[ext_resource type="PackedScene" uid="uid://chetx6gmnwbxi" path="res://objects/entities/cannon_bullet.tscn" id="3_ab2uh"]
+[ext_resource type="Script" uid="uid://b3j23e7b7x8ro" path="res://scripts/components/RecoilComponent.cs" id="4_tynaf"]
+[ext_resource type="Script" uid="uid://c707c53k7c5ae" path="res://scripts/components/SquashAndStretchComponent.cs" id="5_0xigu"]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_j5sus"]
+size = Vector2(16, 16)
+
+[node name="Cannon" type="StaticBody2D"]
+collision_layer = 0
+collision_mask = 0
+
+[node name="Sprite2D" type="Sprite2D" parent="."]
+rotation = 3.14159
+texture = ExtResource("1_0efvn")
+hframes = 12
+vframes = 12
+frame = 42
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+shape = SubResource("RectangleShape2D_j5sus")
+
+[node name="PeriodicShootingComponent" type="Node" parent="." node_paths=PackedStringArray("BulletSpawnPointRight")]
+script = ExtResource("2_4ycs1")
+BulletScene = ExtResource("3_ab2uh")
+ShootInterval = 3.0
+ShootDirection = Vector2(0, 1)
+BulletSpawnPointRight = NodePath("../Bullet spawn")
+ShootingIntervalVariation = 0.61
+metadata/_custom_type_script = "uid://bnaxy8cw3wrko"
+
+[node name="Bullet spawn" type="Marker2D" parent="."]
+position = Vector2(0, 12)
+
+[node name="RecoilComponent" type="Node" parent="." node_paths=PackedStringArray("RecoilTarget")]
+script = ExtResource("4_tynaf")
+RecoilTarget = NodePath("../Sprite2D")
+RecoilDistance = 4.0
+RecoilDuration = 0.12
+metadata/_custom_type_script = "uid://b3j23e7b7x8ro"
+
+[node name="SquashAndStretchComponent" type="Node" parent="." node_paths=PackedStringArray("TargetNode")]
+script = ExtResource("5_0xigu")
+TargetNode = NodePath("../Sprite2D")
+metadata/_custom_type_script = "uid://c707c53k7c5ae"
--- a/objects/entities/cannon_left.tscn
+++ b/objects/entities/cannon_left.tscn
@@ -0,0 +1,48 @@
+[gd_scene load_steps=7 format=3 uid="uid://cm0rd70wafif1"]
+
+[ext_resource type="Texture2D" uid="uid://djifxc5x0dyrw" path="res://sprites/ppc_tileset.png" id="1_hnnrt"]
+[ext_resource type="Script" uid="uid://bnaxy8cw3wrko" path="res://scripts/components/PeriodicShootingComponent.cs" id="2_cho7n"]
+[ext_resource type="PackedScene" uid="uid://chetx6gmnwbxi" path="res://objects/entities/cannon_bullet.tscn" id="3_kgmtj"]
+[ext_resource type="Script" uid="uid://b3j23e7b7x8ro" path="res://scripts/components/RecoilComponent.cs" id="4_nfk87"]
+[ext_resource type="Script" uid="uid://c707c53k7c5ae" path="res://scripts/components/SquashAndStretchComponent.cs" id="5_43fqe"]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_j5sus"]
+size = Vector2(16, 16)
+
+[node name="Cannon" type="StaticBody2D"]
+collision_layer = 0
+collision_mask = 0
+
+[node name="Sprite2D" type="Sprite2D" parent="."]
+rotation = -1.5708
+texture = ExtResource("1_hnnrt")
+hframes = 12
+vframes = 12
+frame = 42
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+shape = SubResource("RectangleShape2D_j5sus")
+
+[node name="PeriodicShootingComponent" type="Node" parent="." node_paths=PackedStringArray("BulletSpawnPointRight")]
+script = ExtResource("2_cho7n")
+BulletScene = ExtResource("3_kgmtj")
+ShootInterval = 3.0
+ShootDirection = Vector2(-1, 0)
+BulletSpawnPointRight = NodePath("../Bullet spawn")
+ShootingIntervalVariation = 0.61
+metadata/_custom_type_script = "uid://bnaxy8cw3wrko"
+
+[node name="Bullet spawn" type="Marker2D" parent="."]
+position = Vector2(-12, 0)
+
+[node name="RecoilComponent" type="Node" parent="." node_paths=PackedStringArray("RecoilTarget")]
+script = ExtResource("4_nfk87")
+RecoilTarget = NodePath("../Sprite2D")
+RecoilDistance = 4.0
+RecoilDuration = 0.12
+metadata/_custom_type_script = "uid://b3j23e7b7x8ro"
+
+[node name="SquashAndStretchComponent" type="Node" parent="." node_paths=PackedStringArray("TargetNode")]
+script = ExtResource("5_43fqe")
+TargetNode = NodePath("../Sprite2D")
+metadata/_custom_type_script = "uid://c707c53k7c5ae"
--- a/objects/entities/cannon_right.tscn
+++ b/objects/entities/cannon_right.tscn
@@ -0,0 +1,47 @@
+[gd_scene load_steps=7 format=3 uid="uid://dr6srln4mckwn"]
+
+[ext_resource type="Texture2D" uid="uid://djifxc5x0dyrw" path="res://sprites/ppc_tileset.png" id="1_r5bjs"]
+[ext_resource type="Script" uid="uid://bnaxy8cw3wrko" path="res://scripts/components/PeriodicShootingComponent.cs" id="2_gd3be"]
+[ext_resource type="PackedScene" uid="uid://chetx6gmnwbxi" path="res://objects/entities/cannon_bullet.tscn" id="3_1gufj"]
+[ext_resource type="Script" uid="uid://b3j23e7b7x8ro" path="res://scripts/components/RecoilComponent.cs" id="4_hwc6x"]
+[ext_resource type="Script" uid="uid://c707c53k7c5ae" path="res://scripts/components/SquashAndStretchComponent.cs" id="5_o674s"]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_j5sus"]
+size = Vector2(16, 16)
+
+[node name="Cannon" type="StaticBody2D"]
+collision_layer = 0
+collision_mask = 0
+
+[node name="Sprite2D" type="Sprite2D" parent="."]
+rotation = 1.5708
+texture = ExtResource("1_r5bjs")
+hframes = 12
+vframes = 12
+frame = 42
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+shape = SubResource("RectangleShape2D_j5sus")
+
+[node name="PeriodicShootingComponent" type="Node" parent="." node_paths=PackedStringArray("BulletSpawnPointRight")]
+script = ExtResource("2_gd3be")
+BulletScene = ExtResource("3_1gufj")
+ShootInterval = 3.0
+BulletSpawnPointRight = NodePath("../Bullet spawn")
+ShootingIntervalVariation = 0.61
+metadata/_custom_type_script = "uid://bnaxy8cw3wrko"
+
+[node name="Bullet spawn" type="Marker2D" parent="."]
+position = Vector2(12, 0)
+
+[node name="RecoilComponent" type="Node" parent="." node_paths=PackedStringArray("RecoilTarget")]
+script = ExtResource("4_hwc6x")
+RecoilTarget = NodePath("../Sprite2D")
+RecoilDistance = 4.0
+RecoilDuration = 0.12
+metadata/_custom_type_script = "uid://b3j23e7b7x8ro"
+
+[node name="SquashAndStretchComponent" type="Node" parent="." node_paths=PackedStringArray("TargetNode")]
+script = ExtResource("5_o674s")
+TargetNode = NodePath("../Sprite2D")
+metadata/_custom_type_script = "uid://c707c53k7c5ae"
--- a/objects/entities/cannon_up.tscn
+++ b/objects/entities/cannon_up.tscn
--- a/objects/entities/falling_spike.tscn
+++ b/objects/entities/falling_spike.tscn
@@ -0,0 +1,78 @@
+[gd_scene load_steps=11 format=3 uid="uid://bmk3ddwv33dud"]
+
+[ext_resource type="Texture2D" uid="uid://ccjihsk6w8sow" path="res://sprites/BFT - Mega Metroidvania Tileset.png" id="1_erbp6"]
+[ext_resource type="Script" uid="uid://2i7p7v135u7c" path="res://scripts/components/DamageComponent.cs" id="2_fq2gn"]
+[ext_resource type="Script" uid="uid://v7tt4w6bejux" path="res://scripts/components/CleanupComponent.cs" id="4_mgh1e"]
+[ext_resource type="Script" uid="uid://nhu2xd8611fk" path="res://scripts/components/HazardComponent.cs" id="5_8g254"]
+[ext_resource type="Script" uid="uid://chusyr5vwgwf0" path="res://scripts/components/CleanupOnCollisionComponent.cs" id="6_2rpon"]
+[ext_resource type="Script" uid="uid://cgfynrn68lp12" path="res://scripts/components/KnockbackComponent.cs" id="6_3n0l8"]
+[ext_resource type="Script" uid="uid://co05ugnvx0v3e" path="res://scripts/components/FallOnDetectionComponent.cs" id="7_mgh1e"]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_t3a48"]
+size = Vector2(16, 8)
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_fq2gn"]
+size = Vector2(16, 320)
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_2rpon"]
+size = Vector2(17, 9)
+
+[node name="FallingSpike" type="RigidBody2D"]
+collision_mask = 5
+gravity_scale = 0.0
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+position = Vector2(0, -4)
+shape = SubResource("RectangleShape2D_t3a48")
+
+[node name="Sprite2D" type="Sprite2D" parent="."]
+rotation = -3.14159
+texture = ExtResource("1_erbp6")
+hframes = 13
+vframes = 45
+frame = 9
+
+[node name="DamageComponent" type="Node" parent="." node_paths=PackedStringArray("Area")]
+script = ExtResource("2_fq2gn")
+Area = NodePath("")
+metadata/_custom_type_script = "uid://2i7p7v135u7c"
+
+[node name="HazardComponent" type="Node2D" parent="." node_paths=PackedStringArray("KnockbackComponent", "HazardArea")]
+script = ExtResource("5_8g254")
+KnockbackComponent = NodePath("../KnockbackComponent")
+HazardArea = NodePath("../HazardArea")
+metadata/_custom_type_script = "uid://nhu2xd8611fk"
+
+[node name="KnockbackComponent" type="Node" parent="."]
+script = ExtResource("6_3n0l8")
+metadata/_custom_type_script = "uid://cgfynrn68lp12"
+
+[node name="FallTriggerArea" type="Area2D" parent="."]
+collision_mask = 4
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="FallTriggerArea"]
+position = Vector2(0, 155)
+shape = SubResource("RectangleShape2D_fq2gn")
+debug_color = Color(0.916282, 7.47952e-05, 0.709809, 0.42)
+
+[node name="CleanupComponent" type="Node" parent="."]
+script = ExtResource("4_mgh1e")
+metadata/_custom_type_script = "uid://v7tt4w6bejux"
+
+[node name="CleanupOnCollisionComponent" type="Node" parent="."]
+script = ExtResource("6_2rpon")
+metadata/_custom_type_script = "uid://chusyr5vwgwf0"
+
+[node name="FallOnDetectionComponent" type="Node2D" parent="." node_paths=PackedStringArray("DetectionArea", "TargetBody")]
+script = ExtResource("7_mgh1e")
+DetectionArea = NodePath("../FallTriggerArea")
+TargetBody = NodePath("..")
+metadata/_custom_type_script = "uid://co05ugnvx0v3e"
+
+[node name="HazardArea" type="Area2D" parent="."]
+collision_mask = 4
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="HazardArea"]
+position = Vector2(0, -4.5)
+shape = SubResource("RectangleShape2D_2rpon")
+debug_color = Color(0.73011, 0.468379, 0.188355, 0.42)
--- a/project.godot
+++ b/project.godot
@@ -19,7 +19,7 @@ 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.4", "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
@@ -80,6 +80,17 @@ movie_writer/fps=24

 enabled=PackedStringArray("res://addons/dialogue_manager/plugin.cfg", "res://addons/limbo_console/plugin.cfg", "res://addons/phantom_camera/plugin.cfg")

+[file_customization]
+
+folder_colors={
+"res://objects/": "red",
+"res://objects/entities/": "yellow",
+"res://resources/": "orange",
+"res://scenes/": "purple",
+"res://scripts/": "teal",
+"res://sprites/": "green"
+}
+
 [global_group]

 coins=""
@@ -89,9 +100,9 @@ Collectables=""

 [gui]

+theme/default_font_antialiasing=0
 theme/default_theme_scale=0.5
 theme/custom_font="res://fonts/PressStart2P-Regular.ttf"
-theme/default_font_antialiasing=0

 [input]

--- a/resources/skills/brick_armor.tres
+++ b/resources/skills/brick_armor.tres
@@ -17,9 +17,6 @@ metadata/_custom_type_script = "uid://dwb0e05pewcsn"
 script = ExtResource("1_unqwr")
 Name = "BRICK_ARMOR"
 Description = "BRICK_ARMOR_DESCRIPTION"
-IsActive = false
-Level = 1
-Type = 1
 Node = ExtResource("1_aqcna")
 Upgrades = Array[ExtResource("2_kqsqd")]([SubResource("Resource_xwv1u"), SubResource("Resource_xwv1u")])
 metadata/_custom_type_script = "uid://d4crrfmbgxnqf"
--- a/resources/skills/brick_shield.tres
+++ b/resources/skills/brick_shield.tres
@@ -26,8 +26,6 @@ metadata/_custom_type_script = "uid://dwb0e05pewcsn"
 script = ExtResource("1_m360g")
 Name = "BRICK_SHIELD"
 Description = "BRICK_SHIELD_DESCRIPTION"
-IsActive = false
-Level = 1
 Type = 2
 Node = ExtResource("1_xjknp")
 Upgrades = Array[ExtResource("2_lr0w4")]([SubResource("Resource_mu2sy"), SubResource("Resource_5ab4a")])
--- a/resources/skills/double_jump.tres
+++ b/resources/skills/double_jump.tres
@@ -8,15 +8,12 @@
 script = ExtResource("2_kywbf")
 Cost = 80
 Description = ""
-Properties = Dictionary[String, Variant]({})
 metadata/_custom_type_script = "uid://dwb0e05pewcsn"

 [resource]
 script = ExtResource("1_p5qvt")
 Name = "DOUBLE_JUMP"
 Description = "DOUBLE_JUMP_DESCRIPTION"
-IsActive = false
-Level = 1
 Type = 2
 Node = ExtResource("1_t7o84")
 Upgrades = Array[ExtResource("2_kywbf")]([SubResource("Resource_0fn2n")])
--- a/resources/skills/ground_pound_skill.tres
+++ b/resources/skills/ground_pound_skill.tres
@@ -8,15 +8,12 @@
 script = ExtResource("2_tkhf7")
 Cost = 300
 Description = ""
-Properties = Dictionary[String, Variant]({})
 metadata/_custom_type_script = "uid://dwb0e05pewcsn"

 [resource]
 script = ExtResource("1_i1qac")
 Name = "GROUND_POUND_SKILL"
 Description = "GROUND_POUND_SKILL_DESCRIPTION"
-IsActive = false
-Level = 1
 Type = 2
 Node = ExtResource("1_auljr")
 Upgrades = Array[ExtResource("2_tkhf7")]([SubResource("Resource_upxa7")])
--- a/resources/skills/xray_vision.tres
+++ b/resources/skills/xray_vision.tres
@@ -26,9 +26,6 @@ metadata/_custom_type_script = "uid://dwb0e05pewcsn"
 script = ExtResource("1_g8qe3")
 Name = "XRAY_VISION"
 Description = "XRAY_VISION_DESCRIPTION"
-IsActive = false
-Level = 1
-Type = 1
 Node = ExtResource("1_ax2d8")
 Upgrades = Array[ExtResource("2_o726x")]([SubResource("Resource_72ltj"), SubResource("Resource_2kdfi")])
 metadata/_custom_type_script = "uid://d4crrfmbgxnqf"
--- a/resources/tilesets/village/background_tileset.tres
+++ b/resources/tilesets/village/background_tileset.tres
--- a/resources/tilesets/village/entities.tres
+++ b/resources/tilesets/village/entities.tres
--- a/resources/tilesets/village/foreground.tres
+++ b/resources/tilesets/village/foreground.tres
--- a/resources/tilesets/village/terain.tres
+++ b/resources/tilesets/village/terain.tres
--- a/scenes/level_village_5.tscn
+++ b/scenes/level_village_5.tscn
--- a/scripts/components/CleanupOnCollisionComponent.cs
+++ b/scripts/components/CleanupOnCollisionComponent.cs
@@ -0,0 +1,46 @@
+using Godot;
+
+namespace Mr.BrickAdventures.scripts.components;
+
+[GlobalClass]
+public partial class CleanupOnCollisionComponent : Node
+{
+    [Export(PropertyHint.Range, "0, 5, 0.1")] public float CleanupDelay { get; set; } = 0.5f;
+    
+    private RigidBody2D _body;
+    private CleanupComponent _cleanupComponent;
+    private bool _isCleaningUp = false;
+    
+    public override void _Ready()
+    {
+        _body = Owner as RigidBody2D;
+        if (_body == null)
+        {
+            GD.PrintErr("CleanupOnCollisionComponent must be attached to a RigidBody2D.");
+            SetProcess(false);
+            return;
+        }
+
+        _cleanupComponent = Owner.GetNode<CleanupComponent>("CleanupComponent");
+        if (_cleanupComponent == null)
+        {
+            GD.PrintErr("CleanupOnCollisionComponent requires a CleanupComponent on the same node.");
+            SetProcess(false);
+            return;
+        }
+
+        _body.BodyEntered += (_) => OnBodyEntered();
+    }
+    
+    private async void OnBodyEntered()
+    {
+        if (_isCleaningUp) return;
+        
+        _isCleaningUp = true;
+        
+        await ToSignal(GetTree().CreateTimer(CleanupDelay), Timer.SignalName.Timeout);
+
+        _cleanupComponent?.CleanUp();
+    }
+
+}
--- a/scripts/components/CleanupOnCollisionComponent.cs.uid
+++ b/scripts/components/CleanupOnCollisionComponent.cs.uid
@@ -0,0 +1 @@
+uid://chusyr5vwgwf0
--- a/scripts/components/FallOnDetectionComponent.cs
+++ b/scripts/components/FallOnDetectionComponent.cs
@@ -0,0 +1,47 @@
+using Godot;
+
+namespace Mr.BrickAdventures.scripts.components;
+
+[GlobalClass]
+public partial class FallOnDetectionComponent : Node2D
+{
+    [Export] public Area2D DetectionArea { get; set; }
+    [Export] public RigidBody2D TargetBody { get; set; }
+    [Export] public float FallDelay { get; set; } = 0.2f;
+    
+    private bool _hasTriggered = false;
+
+    public override void _Ready()
+    {
+        if (DetectionArea == null)
+        {
+            GD.PrintErr("FallOnDetectionComponent: DetectionArea is not set.");
+            SetProcess(false);
+            return;
+        }
+        if (TargetBody == null)
+        {
+            GD.PrintErr("FallOnDetectionComponent: TargetBody is not set.");
+            SetProcess(false);
+            return;
+        }
+
+        DetectionArea.BodyEntered += OnBodyEntered;
+    }
+    
+    private async void OnBodyEntered(Node2D body)
+    {
+        if (_hasTriggered) return;
+        _hasTriggered = true;
+        
+        if (FallDelay > 0)
+        {
+            await ToSignal(GetTree().CreateTimer(FallDelay), Timer.SignalName.Timeout);
+        }
+
+        if (IsInstanceValid(TargetBody))
+        {
+            TargetBody.GravityScale = 1.0f;
+        }
+    }
+}
--- a/scripts/components/FallOnDetectionComponent.cs.uid
+++ b/scripts/components/FallOnDetectionComponent.cs.uid
@@ -0,0 +1 @@
+uid://co05ugnvx0v3e
--- a/Tileset.png
+++ b/Tileset.png
--- a/Tileset.png.import
+++ b/Tileset.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ccjihsk6w8sow"
+path="res://.godot/imported/BFT - Mega Metroidvania Tileset.png-19c14f630afbe7f12271eafb441c25f8.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/BFT - Mega Metroidvania Tileset.png"
+dest_files=["res://.godot/imported/BFT - Mega Metroidvania Tileset.png-19c14f630afbe7f12271eafb441c25f8.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- a/sprites/PS_Tileset_10_nes_extended.png
+++ b/sprites/PS_Tileset_10_nes_extended.png
--- a/sprites/PS_Tileset_10_nes_extended.png.import
+++ b/sprites/PS_Tileset_10_nes_extended.png.import
@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://btiaah4jcpqht"
+path="res://.godot/imported/PS_Tileset_10_nes_extended.png-10092908d64a9b283078c9c31b7f7cc3.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/PS_Tileset_10_nes_extended.png"
+dest_files=["res://.godot/imported/PS_Tileset_10_nes_extended.png-10092908d64a9b283078c9c31b7f7cc3.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- a/sprites/cave_tileset.png
+++ b/sprites/cave_tileset.png
--- a/sprites/cave_tileset.png.import
+++ b/sprites/cave_tileset.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c04306ag4ro5j"
+path="res://.godot/imported/cave_tileset.png-05ea12166d619def5fd5eeabed0dd0ad.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/cave_tileset.png"
+dest_files=["res://.godot/imported/cave_tileset.png-05ea12166d619def5fd5eeabed0dd0ad.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- a/sprites/emotes.png
+++ b/sprites/emotes.png
--- a/sprites/emotes.png.import
+++ b/sprites/emotes.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cbc5a7ckdduex"
+path="res://.godot/imported/emotes.png-dc9b5f07b72b849d0b0397d26d9c24d6.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/emotes.png"
+dest_files=["res://.godot/imported/emotes.png-dc9b5f07b72b849d0b0397d26d9c24d6.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- a/sprites/grass_tile.png
+++ b/sprites/grass_tile.png
--- a/sprites/grass_tile.svg
+++ b/sprites/grass_tile.svg
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="192"
-   height="192"
-   viewBox="0 0 192 192"
-   version="1.1"
-   id="svg1"
-   inkscape:version="1.4.1 (93de688d07, 2025-03-30)"
-   sodipodi:docname="grass_tile.svg"
-   inkscape:export-filename="grass_tile.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#505050"
-     bordercolor="#ffffff"
-     borderopacity="1"
-     inkscape:showpageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="1"
-     inkscape:deskcolor="#505050"
-     inkscape:document-units="px"
-     inkscape:zoom="4.1513748"
-     inkscape:cx="39.986753"
-     inkscape:cy="96.474064"
-     inkscape:window-width="2560"
-     inkscape:window-height="1374"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     showgrid="true">
-    <inkscape:grid
-       id="grid1"
-       units="px"
-       originx="0"
-       originy="0"
-       spacingx="8"
-       spacingy="8"
-       empcolor="#0099e5"
-       empopacity="0.30196078"
-       color="#0099e5"
-       opacity="0.14901961"
-       empspacing="8"
-       enabled="true"
-       visible="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs1">
-    <inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect2"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
-       radius="0"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" />
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#ff9959;stroke:none;stroke-width:0.687408"
-       id="rect2"
-       width="192"
-       height="144"
-       x="0"
-       y="48"
-       sodipodi:type="rect"
-       inkscape:label="mid"
-       ry="15.251407"
-       rx="0" />
-    <rect
-       style="fill:#bf6060;stroke:none;stroke-width:0.627513"
-       id="rect3"
-       width="160"
-       height="144"
-       x="16.000006"
-       y="24"
-       sodipodi:type="rect"
-       inkscape:label="bottom"
-       ry="12" />
-    <path
-       id="rect1"
-       style="display:inline;fill:#21a65d;stroke-width:1.6"
-       d="M 43,0 C 19,0 0,22.400001 0,51.2 V 64 H 192 V 51.2 C 192,22.400001 173,0 149,0 Z"
-       inkscape:label="top" />
-  </g>
-</svg>
--- a/sprites/ppc-tileset.png
+++ b/sprites/ppc-tileset.png
--- a/sprites/ppc-tileset.png.import
+++ b/sprites/ppc-tileset.png.import
@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cysarpu6snb2y"
+path="res://.godot/imported/ppc-tileset.png-9fa878d605ba142a07487f571cb041bd.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/ppc-tileset.png"
+dest_files=["res://.godot/imported/ppc-tileset.png-9fa878d605ba142a07487f571cb041bd.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
Author	SHA1	Message	Date
Gabriel Kaszewski	00772b6330	Update resource files and add new tileset; remove inactive properties and upgrade paths	2025-10-13 21:09:05 +02:00
Gabriel Kaszewski	3d8694377a	Add FallOnDetectionComponent and CleanupOnCollisionComponent; implement falling detection and cleanup on collision	2025-09-13 22:04:36 +02:00