Merge branch 'main' into custom-level-loading-rewrite

Scenes/Levels/ChallengeModeResults.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=62 format=3 uid="uid://blv1d12smlibh"]
+[gd_scene load_steps=64 format=3 uid="uid://blv1d12smlibh"]
 
 [ext_resource type="Script" uid="uid://bqhrq7sabq811" path="res://Scripts/UI/ChallengeModeResults.gd" id="1_3x4fv"]
 [ext_resource type="Texture2D" uid="uid://116yaio262mj" path="res://Assets/Sprites/UI/ChallengeResultsTemplate.png" id="3_um36a"]
@@ -16,6 +16,9 @@
 [ext_resource type="Texture2D" uid="uid://de6otencrflfo" path="res://Assets/Sprites/UI/RedCoins.png" id="10_d76il"]
 [ext_resource type="Texture2D" uid="uid://wx6yyqabrelf" path="res://Assets/Sprites/UI/ChallengeResultsPanel.png" id="11_02i7h"]
 [ext_resource type="AudioStream" uid="uid://n07ty0sc76em" path="res://Assets/Audio/SFX/ChallengeModeGive.mp3" id="11_nym8o"]
+[ext_resource type="JSON" path="res://Assets/Audio/BGM/ChallengeResults.json" id="12_fb45j"]
+[ext_resource type="AudioStream" uid="uid://dhiy4bmyu3j0r" path="res://Assets/Audio/BGM/ChallengeEnd.mp3" id="12_x7w5s"]
+[ext_resource type="JSON" path="res://Assets/Audio/BGM/ChallengeEnd.json" id="12_y63tt"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Players/ToadNPC.json" id="14_sv6qk"]
 [ext_resource type="Texture2D" uid="uid://cxtan2ap83u3d" path="res://Assets/Sprites/UI/ChallengeMedals.png" id="14_woqpu"]
 [ext_resource type="Texture2D" uid="uid://c7jq6t1d2mhur" path="res://Assets/Sprites/Items/YoshiEgg.png" id="16_1h3k2"]
@@ -34,11 +37,6 @@
 [ext_resource type="PackedScene" uid="uid://dntk2js0tu3y2" path="res://Scenes/Prefabs/UI/WorldSelect.tscn" id="32_xk7j8"]
 [ext_resource type="PackedScene" uid="uid://bsfkt344e6j38" path="res://Scenes/Prefabs/UI/LevelSelectNew.tscn" id="33_x7w5s"]
 
-[sub_resource type="Resource" id="Resource_cq5a1"]
-script = ExtResource("10_bylb3")
-Overworld = ExtResource("7_6dwpv")
-metadata/_custom_type_script = "uid://cmvlgsjmsk0v5"
-
 [sub_resource type="Animation" id="Animation_6dwpv"]
 resource_name = "Main"
 length = 30.0
@@ -765,18 +763,29 @@ metadata/_custom_type_script = "uid://b08qfwj5jk6g1"
 script = ExtResource("7_bob8r")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
-[node name="Music" type="AudioStreamPlayer" parent="."]
-process_mode = 3
+[node name="ChallengeResults" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("7_6dwpv")
-autoplay = true
 bus = &"Music"
 
-[node name="ResourceSetter" type="Node" parent="Music" node_paths=PackedStringArray("node_to_affect")]
-script = ExtResource("9_iyieq")
+[node name="ResourceSetterNew" type="Node" parent="ChallengeResults" node_paths=PackedStringArray("node_to_affect")]
+script = ExtResource("7_bob8r")
 node_to_affect = NodePath("..")
 property_name = "stream"
-themed_resource = SubResource("Resource_cq5a1")
-metadata/_custom_type_script = "uid://cq6f682453q6o"
+mode = 2
+resource_json = ExtResource("12_fb45j")
+metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
+
+[node name="ChallengeEnd" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("12_x7w5s")
+bus = &"Music"
+
+[node name="ResourceSetterNew" type="Node" parent="ChallengeEnd" node_paths=PackedStringArray("node_to_affect")]
+script = ExtResource("7_bob8r")
+node_to_affect = NodePath("..")
+property_name = "stream"
+mode = 2
+resource_json = ExtResource("12_y63tt")
+metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
 [node name="MainSequence" type="AnimationPlayer" parent="."]
 libraries = {
@@ -1068,6 +1077,7 @@ metadata/_custom_type_script = "uid://364rywt44hy6"
 
 [node name="PauseMenu" parent="CanvasLayer" instance=ExtResource("31_1l20f")]
 visible = false
+can_exit = false
 
 [node name="WorldSelect" parent="CanvasLayer" instance=ExtResource("32_xk7j8")]
 visible = false
@@ -1098,7 +1108,6 @@ grow_horizontal = 2
 grow_vertical = 2
 has_challenge_stuff = true
 
-[connection signal="sprites_updated" from="Music/ResourceSetter" to="Music" method="play"]
 [connection signal="option_1_selected" from="CanvasLayer/PauseMenu" to="." method="retry_level"]
 [connection signal="option_2_selected" from="CanvasLayer/PauseMenu" to="CanvasLayer/PauseMenu" method="close"]
 [connection signal="option_2_selected" from="CanvasLayer/PauseMenu" to="CanvasLayer/WorldSelect" method="open"]

Scenes/Levels/RomResourceGenerator.tscn

@@ -47,6 +47,7 @@ grow_horizontal = 2
 grow_vertical = 0
 text = "EXTRACTING ASSETS..."
 horizontal_alignment = 1
+uppercase = true
 
 [node name="Error" type="Label" parent="MarginContainer"]
 unique_name_in_owner = true

Scenes/Levels/SMB1/World-1/-1-1.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=24 format=4 uid="uid://cel0ku4pdmu2u"]
+[gd_scene load_steps=28 format=4 uid="uid://cel0ku4pdmu2u"]
 
 [ext_resource type="Script" uid="uid://bcqr1v25ygedb" path="res://Scripts/Classes/LevelClass.gd" id="1_0pu1d"]
 [ext_resource type="JSON" path="res://Assets/Audio/BGM/Underwater.json" id="2_4i10n"]
@@ -14,16 +14,22 @@
 [ext_resource type="PackedScene" uid="uid://e3wkbwtm7sh" path="res://Scenes/Parts/WaterArea.tscn" id="16_6y123"]
 [ext_resource type="PackedScene" uid="uid://bney0cc8cfm5s" path="res://Scenes/Prefabs/LevelObjects/EndFinalCastle.tscn" id="16_8q1jv"]
 [ext_resource type="PackedScene" uid="uid://h7ys3yw5jvx3" path="res://Scenes/Prefabs/LevelObjects/Checkpoint.tscn" id="17_bdyl0"]
-[ext_resource type="Texture2D" uid="uid://boivfkpqvnx45" path="res://Assets/Sprites/Players/Peach.png" id="17_itite"]
+[ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="17_xhct6"]
 [ext_resource type="PackedScene" uid="uid://bjysym6bhxljv" path="res://Scenes/Prefabs/Entities/Enemies/BowsersBro.tscn" id="18_4i10n"]
 [ext_resource type="PackedScene" uid="uid://r6dlmokkdyar" path="res://Scenes/Prefabs/Entities/Enemies/GreenKoopaTroopa.tscn" id="19_j3p10"]
+[ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="19_xhct6"]
 [ext_resource type="PackedScene" uid="uid://dnx48rakxib6u" path="res://Scenes/Prefabs/Entities/Enemies/Goomba.tscn" id="20_4i10n"]
+[ext_resource type="JSON" path="res://Assets/Sprites/Players/PeachNPC.json" id="20_62ed8"]
 [ext_resource type="PackedScene" uid="uid://f48a0jmx334d" path="res://Scenes/Prefabs/Entities/Objects/SmallElevatorPlatform.tscn" id="21_4i10n"]
 [ext_resource type="PackedScene" uid="uid://kr7i2kf6rew0" path="res://Scenes/Prefabs/Entities/Enemies/HammerBro.tscn" id="22_vijwj"]
 [ext_resource type="PackedScene" uid="uid://cmvugag0kupgu" path="res://Scenes/Prefabs/Entities/Enemies/RedKoopaTroopa.tscn" id="23_xhct6"]
 [ext_resource type="PackedScene" uid="uid://bksxgpygrdjl7" path="res://Scenes/Prefabs/LevelBG.tscn" id="26_6dnyh"]
 [ext_resource type="Script" uid="uid://cybpwmw4ywoow" path="res://Scripts/Parts/TileMapConverter.gd" id="27_pymdo"]
 
+[sub_resource type="SpriteFrames" id="SpriteFrames_62ed8"]
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_6dnyh"]
+
 [node name="-1-3" type="Node"]
 script = ExtResource("1_0pu1d")
 music = ExtResource("2_4i10n")
@@ -82,17 +88,31 @@ tile_map_data = PackedByteArray("AADv/wAAAAABAAAAAADw/wAAAAACAAAAAADx/wAAAAACAAA
 [node name="Tiles3" parent="." instance=ExtResource("5_rfb0y")]
 tile_map_data = PackedByteArray("AABoAPj/AgAAAAUAAABpAPj/AgAAAAUAAABhAP//AgAAAAUAAABiAP//AgAAAAUAAABjAP//AgAAAAUAAABRAPf/AgAAAAUAAABSAPf/AgAAAAUAAABNAPf/AgAAAAUAAABOAPf/AgAAAAUAAABFAPj/AgAAAAUAAABGAPj/AgAAAAUAAAAsAPf/AgAAAAUAAAAtAPf/AgAAAAUAAAAuAPf/AgAAAAUAAAAvAPf/AgAAAAUAAAAiAPn/AgAAAAUAAAAjAPn/AgAAAAUAAAAVAPX/AgAAAAUAAAAWAPX/AgAAAAUAAAARAP7/AgAAAAUAAAALAPf/AgAAAAUAAAAMAPf/AgAAAAUAAAANAPf/AgAAAAUAAAA=")
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="PeachNPC1" type="AnimatedSprite2D" parent="."]
 position = Vector2(24, -16)
-texture = ExtResource("17_itite")
-region_enabled = true
-region_rect = Rect2(16, 0, 16, 32)
+sprite_frames = SubResource("SpriteFrames_62ed8")
+script = ExtResource("17_xhct6")
+metadata/_custom_type_script = "uid://caq1qiwmy0mox"
 
-[node name="Sprite2D2" type="Sprite2D" parent="."]
+[node name="ResourceSetterNew" type="Node" parent="PeachNPC1" node_paths=PackedStringArray("node_to_affect")]
+script = ExtResource("19_xhct6")
+node_to_affect = NodePath("..")
+property_name = "sprite_frames"
+resource_json = ExtResource("20_62ed8")
+metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
+
+[node name="PeachNPC2" type="AnimatedSprite2D" parent="."]
 position = Vector2(1280, -8)
-texture = ExtResource("17_itite")
-region_enabled = true
-region_rect = Rect2(16, 0, 16, 32)
+sprite_frames = SubResource("SpriteFrames_6dnyh")
+script = ExtResource("17_xhct6")
+metadata/_custom_type_script = "uid://caq1qiwmy0mox"
+
+[node name="ResourceSetterNew" type="Node" parent="PeachNPC2" node_paths=PackedStringArray("node_to_affect")]
+script = ExtResource("19_xhct6")
+node_to_affect = NodePath("")
+property_name = "sprite_frames"
+resource_json = ExtResource("20_62ed8")
+metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
 [node name="BowsersBro" parent="." instance=ExtResource("18_4i10n")]
 position = Vector2(584, 0)
@@ -125,25 +145,25 @@ position = Vector2(1592, -16)
 position = Vector2(2008, -96)
 
 [connection signal="collected" from="Tiles/Coin" to="Tiles/Coin/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190955" to="Tiles/@Node2D@190955/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190956" to="Tiles/@Node2D@190956/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190957" to="Tiles/@Node2D@190957/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190958" to="Tiles/@Node2D@190958/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190959" to="Tiles/@Node2D@190959/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190960" to="Tiles/@Node2D@190960/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190961" to="Tiles/@Node2D@190961/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190962" to="Tiles/@Node2D@190962/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190963" to="Tiles/@Node2D@190963/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190964" to="Tiles/@Node2D@190964/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190965" to="Tiles/@Node2D@190965/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190966" to="Tiles/@Node2D@190966/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190967" to="Tiles/@Node2D@190967/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190968" to="Tiles/@Node2D@190968/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190969" to="Tiles/@Node2D@190969/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190970" to="Tiles/@Node2D@190970/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190971" to="Tiles/@Node2D@190971/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190972" to="Tiles/@Node2D@190972/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190973" to="Tiles/@Node2D@190973/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190974" to="Tiles/@Node2D@190974/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190975" to="Tiles/@Node2D@190975/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@190976" to="Tiles/@Node2D@190976/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67370" to="Tiles/@Node2D@67370/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67371" to="Tiles/@Node2D@67371/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67372" to="Tiles/@Node2D@67372/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67373" to="Tiles/@Node2D@67373/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67374" to="Tiles/@Node2D@67374/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67375" to="Tiles/@Node2D@67375/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67376" to="Tiles/@Node2D@67376/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67377" to="Tiles/@Node2D@67377/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67378" to="Tiles/@Node2D@67378/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67379" to="Tiles/@Node2D@67379/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67380" to="Tiles/@Node2D@67380/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67381" to="Tiles/@Node2D@67381/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67382" to="Tiles/@Node2D@67382/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67383" to="Tiles/@Node2D@67383/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67384" to="Tiles/@Node2D@67384/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67385" to="Tiles/@Node2D@67385/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67386" to="Tiles/@Node2D@67386/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67387" to="Tiles/@Node2D@67387/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67388" to="Tiles/@Node2D@67388/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67389" to="Tiles/@Node2D@67389/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67390" to="Tiles/@Node2D@67390/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@67391" to="Tiles/@Node2D@67391/LevelPersistance" method="set_as_active"]

Scenes/Levels/SMBANN/LostLevelsEnding.tscn

@@ -7,7 +7,7 @@
 [ext_resource type="Script" uid="uid://b08qfwj5jk6g1" path="res://Scripts/Parts/PlayerSprite.gd" id="8_gnn3a"]
 [ext_resource type="PackedScene" uid="uid://cinr6kcbmo6gr" path="res://Scenes/Parts/DropShadowRenderer.tscn" id="9_3f2f2"]
 [ext_resource type="Texture2D" uid="uid://boivfkpqvnx45" path="res://Assets/Sprites/Players/Peach.png" id="10_5xkvw"]
-[ext_resource type="FontVariation" uid="uid://djxdgxy1iv8yv" path="res://Resources/ThemedResources/FontLLMain.tres" id="11_yglne"]
+[ext_resource type="FontVariation" uid="uid://bl7sbw4nx3l1t" path="res://Resources/ThemedResources/FontMain.tres" id="11_yglne"]
 [ext_resource type="Texture2D" uid="uid://fdn41mmtnhdt" path="res://Assets/Sprites/Players/ToadNPCLL.png" id="12_gvpv4"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="13_2i527"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Players/ToadNPC.json" id="14_swpxw"]

Scenes/Levels/SMBLL/LostLevelsEnding.tscn

@@ -6,7 +6,7 @@
 [ext_resource type="Script" uid="uid://b08qfwj5jk6g1" path="res://Scripts/Parts/PlayerSprite.gd" id="4_tkq3a"]
 [ext_resource type="Texture2D" uid="uid://dkjam0jo2k2m0" path="res://Assets/Sprites/Backgrounds/Bushes/CastleBushNight.png" id="5_wr0ye"]
 [ext_resource type="PackedScene" uid="uid://cinr6kcbmo6gr" path="res://Scenes/Parts/DropShadowRenderer.tscn" id="6_g1x38"]
-[ext_resource type="FontVariation" uid="uid://djxdgxy1iv8yv" path="res://Resources/ThemedResources/FontLLMain.tres" id="9_1flm1"]
+[ext_resource type="FontVariation" uid="uid://bl7sbw4nx3l1t" path="res://Resources/ThemedResources/FontMain.tres" id="9_1flm1"]
 [ext_resource type="PackedScene" uid="uid://bksxgpygrdjl7" path="res://Scenes/Prefabs/LevelBG.tscn" id="10_iab5g"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Players/PeachNPC.json" id="11_ecp1v"]
 [ext_resource type="Texture2D" uid="uid://fdn41mmtnhdt" path="res://Assets/Sprites/Players/ToadNPCLL.png" id="11_iab5g"]

Scenes/Levels/SMBLL/World8/8-1b.tscn

@@ -56,7 +56,7 @@ nodes_to_delete = [NodePath("../WarpZone")]
 metadata/_custom_type_script = "uid://cgm3opb5qudc1"
 
 [node name="Tiles" parent="ChallengeNodes" instance=ExtResource("3_qnelb")]
-tile_map_data = PackedByteArray("AAAAAAAAAAACAAAAAAAAAAEAAAACAAEAAAAAAAIAAAACAAIAAAABAAAAAAACAAAAAAABAAEAAAACAAEAAAABAAIAAAACAAIAAAACAAAAAAACAAAAAAACAAEAAAACAAEAAAACAAIAAAACAAIAAAAEAPn/AQAAAAAAAQAFAPn/AQAAAAAAAQAGAPn/AQAAAAAAAgAHAPn/AQAAAAAAAQAIAPn/AQAAAAAAAgAJAPn/AQAAAAAAAQAKAPn/AQAAAAAAAQALAPn/AQAAAAAAAgAMAPn/AQAAAAAAAQANAPn/AQAAAAAAAQABAPz/AQAAAAAAAQACAPz/AQAAAAAAAQADAPz/AQAAAAAAAgAEAPz/AQAAAAAAAQAFAPz/AQAAAAAAAgAGAPz/AQAAAAAAAQAHAPz/AQAAAAAAAQAIAPz/AQAAAAAAAgAJAPz/AQAAAAAAAQAKAPz/AQAAAAAAAQALAPz/AQAAAAAAAQACAP7/AAAKAAIAAAACAP//AAAKAAMAAAABAP7/AAALAAIAAAABAP//AAALAAMAAAA=")
+tile_map_data = PackedByteArray("AAAAAAAAAAACAAAAAAAAAAEAAAACAAEAAAAAAAIAAAACAAIAAAABAAAAAAACAAAAAAABAAEAAAACAAEAAAABAAIAAAACAAIAAAACAAAAAAACAAAAAAACAAEAAAACAAEAAAACAAIAAAACAAIAAAAEAPn/AQAAAAAAAQAFAPn/AQAAAAAAAQAGAPn/AQAAAAAAAgAHAPn/AQAAAAAAAQAIAPn/AQAAAAAAAgAJAPn/AQAAAAAAAQAKAPn/AQAAAAAAAQALAPn/AQAAAAAAAgAMAPn/AQAAAAAAAQANAPn/AQAAAAAAAQABAPz/AQAAAAAAAQACAPz/AQAAAAAAAQADAPz/AQAAAAAAAgAEAPz/AQAAAAAAAQAFAPz/AQAAAAAAAgAGAPz/AQAAAAAAAQAHAPz/AQAAAAAAAQAIAPz/AQAAAAAAAgAJAPz/AQAAAAAAAQAKAPz/AQAAAAAAAQALAPz/AQAAAAAAAQACAP7/AAAPAAIAAAACAP//AAAPAAMAAAABAP7/AAALAAIAAAABAP//AAALAAMAAAA=")
 
 [node name="PipeArea" parent="ChallengeNodes" instance=ExtResource("16_d6oav")]
 position = Vector2(48, -16)
@@ -71,13 +71,13 @@ target_level = "uid://epdr670fya5e"
 [connection signal="player_block_hit" from="ChallengeNodes/Tiles/BrickBlock" to="ChallengeNodes/Tiles/BrickBlock/BlockAnimations" method="bounce_block" unbinds=1]
 [connection signal="shell_block_hit" from="ChallengeNodes/Tiles/BrickBlock" to="ChallengeNodes/Tiles/BrickBlock" method="on_shell_block_hit"]
 [connection signal="shell_block_hit" from="ChallengeNodes/Tiles/BrickBlock" to="ChallengeNodes/Tiles/BrickBlock/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67789" to="ChallengeNodes/Tiles/@AnimatableBody2D@67789/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67789" to="ChallengeNodes/Tiles/@AnimatableBody2D@67789/LevelPersistance" method="set_as_active"]
-[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67789" to="ChallengeNodes/Tiles/@AnimatableBody2D@67789" method="check_brick_empty"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67789" to="ChallengeNodes/Tiles/@AnimatableBody2D@67789" method="on_block_hit"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67789" to="ChallengeNodes/Tiles/@AnimatableBody2D@67789/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67789" to="ChallengeNodes/Tiles/@AnimatableBody2D@67789" method="on_shell_block_hit"]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67789" to="ChallengeNodes/Tiles/@AnimatableBody2D@67789/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35441" to="ChallengeNodes/Tiles/@AnimatableBody2D@35441/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35441" to="ChallengeNodes/Tiles/@AnimatableBody2D@35441/LevelPersistance" method="set_as_active"]
+[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35441" to="ChallengeNodes/Tiles/@AnimatableBody2D@35441" method="check_brick_empty"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35441" to="ChallengeNodes/Tiles/@AnimatableBody2D@35441" method="on_block_hit"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35441" to="ChallengeNodes/Tiles/@AnimatableBody2D@35441/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35441" to="ChallengeNodes/Tiles/@AnimatableBody2D@35441" method="on_shell_block_hit"]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35441" to="ChallengeNodes/Tiles/@AnimatableBody2D@35441/BlockAnimations" method="bounce_block" unbinds=1]
 [connection signal="block_destroyed" from="ChallengeNodes/Tiles/QuestionBlock" to="ChallengeNodes/Tiles/QuestionBlock/LevelPersistance" method="set_as_active_2"]
 [connection signal="block_emptied" from="ChallengeNodes/Tiles/QuestionBlock" to="ChallengeNodes/Tiles/QuestionBlock/LevelPersistance" method="set_as_active"]
 [connection signal="player_block_hit" from="ChallengeNodes/Tiles/QuestionBlock" to="ChallengeNodes/Tiles/QuestionBlock" method="player_mushroom_check"]
@@ -85,129 +85,129 @@ target_level = "uid://epdr670fya5e"
 [connection signal="player_block_hit" from="ChallengeNodes/Tiles/QuestionBlock" to="ChallengeNodes/Tiles/QuestionBlock/BlockAnimations" method="bounce_block" unbinds=1]
 [connection signal="shell_block_hit" from="ChallengeNodes/Tiles/QuestionBlock" to="ChallengeNodes/Tiles/QuestionBlock" method="dispense_item" unbinds=1]
 [connection signal="shell_block_hit" from="ChallengeNodes/Tiles/QuestionBlock" to="ChallengeNodes/Tiles/QuestionBlock/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67790" to="ChallengeNodes/Tiles/@AnimatableBody2D@67790/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67790" to="ChallengeNodes/Tiles/@AnimatableBody2D@67790/LevelPersistance" method="set_as_active"]
-[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67790" to="ChallengeNodes/Tiles/@AnimatableBody2D@67790" method="check_brick_empty"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67790" to="ChallengeNodes/Tiles/@AnimatableBody2D@67790" method="on_block_hit"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67790" to="ChallengeNodes/Tiles/@AnimatableBody2D@67790/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67790" to="ChallengeNodes/Tiles/@AnimatableBody2D@67790" method="on_shell_block_hit"]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67790" to="ChallengeNodes/Tiles/@AnimatableBody2D@67790/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67791" to="ChallengeNodes/Tiles/@AnimatableBody2D@67791/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67791" to="ChallengeNodes/Tiles/@AnimatableBody2D@67791/LevelPersistance" method="set_as_active"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67791" to="ChallengeNodes/Tiles/@AnimatableBody2D@67791" method="player_mushroom_check"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67791" to="ChallengeNodes/Tiles/@AnimatableBody2D@67791" method="dispense_item" unbinds=1]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67791" to="ChallengeNodes/Tiles/@AnimatableBody2D@67791/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67791" to="ChallengeNodes/Tiles/@AnimatableBody2D@67791" method="dispense_item" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67791" to="ChallengeNodes/Tiles/@AnimatableBody2D@67791/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67792" to="ChallengeNodes/Tiles/@AnimatableBody2D@67792/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67792" to="ChallengeNodes/Tiles/@AnimatableBody2D@67792/LevelPersistance" method="set_as_active"]
-[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67792" to="ChallengeNodes/Tiles/@AnimatableBody2D@67792" method="check_brick_empty"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67792" to="ChallengeNodes/Tiles/@AnimatableBody2D@67792" method="on_block_hit"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67792" to="ChallengeNodes/Tiles/@AnimatableBody2D@67792/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67792" to="ChallengeNodes/Tiles/@AnimatableBody2D@67792" method="on_shell_block_hit"]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67792" to="ChallengeNodes/Tiles/@AnimatableBody2D@67792/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67793" to="ChallengeNodes/Tiles/@AnimatableBody2D@67793/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67793" to="ChallengeNodes/Tiles/@AnimatableBody2D@67793/LevelPersistance" method="set_as_active"]
-[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67793" to="ChallengeNodes/Tiles/@AnimatableBody2D@67793" method="check_brick_empty"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67793" to="ChallengeNodes/Tiles/@AnimatableBody2D@67793" method="on_block_hit"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67793" to="ChallengeNodes/Tiles/@AnimatableBody2D@67793/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67793" to="ChallengeNodes/Tiles/@AnimatableBody2D@67793" method="on_shell_block_hit"]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67793" to="ChallengeNodes/Tiles/@AnimatableBody2D@67793/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67794" to="ChallengeNodes/Tiles/@AnimatableBody2D@67794/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67794" to="ChallengeNodes/Tiles/@AnimatableBody2D@67794/LevelPersistance" method="set_as_active"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67794" to="ChallengeNodes/Tiles/@AnimatableBody2D@67794" method="player_mushroom_check"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67794" to="ChallengeNodes/Tiles/@AnimatableBody2D@67794" method="dispense_item" unbinds=1]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67794" to="ChallengeNodes/Tiles/@AnimatableBody2D@67794/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67794" to="ChallengeNodes/Tiles/@AnimatableBody2D@67794" method="dispense_item" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67794" to="ChallengeNodes/Tiles/@AnimatableBody2D@67794/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67795" to="ChallengeNodes/Tiles/@AnimatableBody2D@67795/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67795" to="ChallengeNodes/Tiles/@AnimatableBody2D@67795/LevelPersistance" method="set_as_active"]
-[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67795" to="ChallengeNodes/Tiles/@AnimatableBody2D@67795" method="check_brick_empty"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67795" to="ChallengeNodes/Tiles/@AnimatableBody2D@67795" method="on_block_hit"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67795" to="ChallengeNodes/Tiles/@AnimatableBody2D@67795/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67795" to="ChallengeNodes/Tiles/@AnimatableBody2D@67795" method="on_shell_block_hit"]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67795" to="ChallengeNodes/Tiles/@AnimatableBody2D@67795/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67796" to="ChallengeNodes/Tiles/@AnimatableBody2D@67796/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67796" to="ChallengeNodes/Tiles/@AnimatableBody2D@67796/LevelPersistance" method="set_as_active"]
-[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67796" to="ChallengeNodes/Tiles/@AnimatableBody2D@67796" method="check_brick_empty"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67796" to="ChallengeNodes/Tiles/@AnimatableBody2D@67796" method="on_block_hit"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67796" to="ChallengeNodes/Tiles/@AnimatableBody2D@67796/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67796" to="ChallengeNodes/Tiles/@AnimatableBody2D@67796" method="on_shell_block_hit"]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67796" to="ChallengeNodes/Tiles/@AnimatableBody2D@67796/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67797" to="ChallengeNodes/Tiles/@AnimatableBody2D@67797/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67797" to="ChallengeNodes/Tiles/@AnimatableBody2D@67797/LevelPersistance" method="set_as_active"]
-[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67797" to="ChallengeNodes/Tiles/@AnimatableBody2D@67797" method="check_brick_empty"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67797" to="ChallengeNodes/Tiles/@AnimatableBody2D@67797" method="on_block_hit"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67797" to="ChallengeNodes/Tiles/@AnimatableBody2D@67797/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67797" to="ChallengeNodes/Tiles/@AnimatableBody2D@67797" method="on_shell_block_hit"]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67797" to="ChallengeNodes/Tiles/@AnimatableBody2D@67797/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67798" to="ChallengeNodes/Tiles/@AnimatableBody2D@67798/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67798" to="ChallengeNodes/Tiles/@AnimatableBody2D@67798/LevelPersistance" method="set_as_active"]
-[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67798" to="ChallengeNodes/Tiles/@AnimatableBody2D@67798" method="check_brick_empty"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67798" to="ChallengeNodes/Tiles/@AnimatableBody2D@67798" method="on_block_hit"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67798" to="ChallengeNodes/Tiles/@AnimatableBody2D@67798/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67798" to="ChallengeNodes/Tiles/@AnimatableBody2D@67798" method="on_shell_block_hit"]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67798" to="ChallengeNodes/Tiles/@AnimatableBody2D@67798/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67799" to="ChallengeNodes/Tiles/@AnimatableBody2D@67799/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67799" to="ChallengeNodes/Tiles/@AnimatableBody2D@67799/LevelPersistance" method="set_as_active"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67799" to="ChallengeNodes/Tiles/@AnimatableBody2D@67799" method="player_mushroom_check"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67799" to="ChallengeNodes/Tiles/@AnimatableBody2D@67799" method="dispense_item" unbinds=1]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67799" to="ChallengeNodes/Tiles/@AnimatableBody2D@67799/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67799" to="ChallengeNodes/Tiles/@AnimatableBody2D@67799" method="dispense_item" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67799" to="ChallengeNodes/Tiles/@AnimatableBody2D@67799/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67800" to="ChallengeNodes/Tiles/@AnimatableBody2D@67800/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67800" to="ChallengeNodes/Tiles/@AnimatableBody2D@67800/LevelPersistance" method="set_as_active"]
-[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67800" to="ChallengeNodes/Tiles/@AnimatableBody2D@67800" method="check_brick_empty"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67800" to="ChallengeNodes/Tiles/@AnimatableBody2D@67800" method="on_block_hit"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67800" to="ChallengeNodes/Tiles/@AnimatableBody2D@67800/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67800" to="ChallengeNodes/Tiles/@AnimatableBody2D@67800" method="on_shell_block_hit"]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67800" to="ChallengeNodes/Tiles/@AnimatableBody2D@67800/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67801" to="ChallengeNodes/Tiles/@AnimatableBody2D@67801/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67801" to="ChallengeNodes/Tiles/@AnimatableBody2D@67801/LevelPersistance" method="set_as_active"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67801" to="ChallengeNodes/Tiles/@AnimatableBody2D@67801" method="player_mushroom_check"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67801" to="ChallengeNodes/Tiles/@AnimatableBody2D@67801" method="dispense_item" unbinds=1]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67801" to="ChallengeNodes/Tiles/@AnimatableBody2D@67801/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67801" to="ChallengeNodes/Tiles/@AnimatableBody2D@67801" method="dispense_item" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67801" to="ChallengeNodes/Tiles/@AnimatableBody2D@67801/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67802" to="ChallengeNodes/Tiles/@AnimatableBody2D@67802/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67802" to="ChallengeNodes/Tiles/@AnimatableBody2D@67802/LevelPersistance" method="set_as_active"]
-[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67802" to="ChallengeNodes/Tiles/@AnimatableBody2D@67802" method="check_brick_empty"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67802" to="ChallengeNodes/Tiles/@AnimatableBody2D@67802" method="on_block_hit"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67802" to="ChallengeNodes/Tiles/@AnimatableBody2D@67802/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67802" to="ChallengeNodes/Tiles/@AnimatableBody2D@67802" method="on_shell_block_hit"]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67802" to="ChallengeNodes/Tiles/@AnimatableBody2D@67802/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67803" to="ChallengeNodes/Tiles/@AnimatableBody2D@67803/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67803" to="ChallengeNodes/Tiles/@AnimatableBody2D@67803/LevelPersistance" method="set_as_active"]
-[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67803" to="ChallengeNodes/Tiles/@AnimatableBody2D@67803" method="check_brick_empty"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67803" to="ChallengeNodes/Tiles/@AnimatableBody2D@67803" method="on_block_hit"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67803" to="ChallengeNodes/Tiles/@AnimatableBody2D@67803/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67803" to="ChallengeNodes/Tiles/@AnimatableBody2D@67803" method="on_shell_block_hit"]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67803" to="ChallengeNodes/Tiles/@AnimatableBody2D@67803/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67804" to="ChallengeNodes/Tiles/@AnimatableBody2D@67804/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67804" to="ChallengeNodes/Tiles/@AnimatableBody2D@67804/LevelPersistance" method="set_as_active"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67804" to="ChallengeNodes/Tiles/@AnimatableBody2D@67804" method="player_mushroom_check"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67804" to="ChallengeNodes/Tiles/@AnimatableBody2D@67804" method="dispense_item" unbinds=1]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67804" to="ChallengeNodes/Tiles/@AnimatableBody2D@67804/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67804" to="ChallengeNodes/Tiles/@AnimatableBody2D@67804" method="dispense_item" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67804" to="ChallengeNodes/Tiles/@AnimatableBody2D@67804/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67805" to="ChallengeNodes/Tiles/@AnimatableBody2D@67805/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67805" to="ChallengeNodes/Tiles/@AnimatableBody2D@67805/LevelPersistance" method="set_as_active"]
-[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67805" to="ChallengeNodes/Tiles/@AnimatableBody2D@67805" method="check_brick_empty"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67805" to="ChallengeNodes/Tiles/@AnimatableBody2D@67805" method="on_block_hit"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67805" to="ChallengeNodes/Tiles/@AnimatableBody2D@67805/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67805" to="ChallengeNodes/Tiles/@AnimatableBody2D@67805" method="on_shell_block_hit"]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67805" to="ChallengeNodes/Tiles/@AnimatableBody2D@67805/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67806" to="ChallengeNodes/Tiles/@AnimatableBody2D@67806/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67806" to="ChallengeNodes/Tiles/@AnimatableBody2D@67806/LevelPersistance" method="set_as_active"]
-[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67806" to="ChallengeNodes/Tiles/@AnimatableBody2D@67806" method="check_brick_empty"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67806" to="ChallengeNodes/Tiles/@AnimatableBody2D@67806" method="on_block_hit"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67806" to="ChallengeNodes/Tiles/@AnimatableBody2D@67806/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67806" to="ChallengeNodes/Tiles/@AnimatableBody2D@67806" method="on_shell_block_hit"]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67806" to="ChallengeNodes/Tiles/@AnimatableBody2D@67806/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67807" to="ChallengeNodes/Tiles/@AnimatableBody2D@67807/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@67807" to="ChallengeNodes/Tiles/@AnimatableBody2D@67807/LevelPersistance" method="set_as_active"]
-[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@67807" to="ChallengeNodes/Tiles/@AnimatableBody2D@67807" method="check_brick_empty"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67807" to="ChallengeNodes/Tiles/@AnimatableBody2D@67807" method="on_block_hit"]
-[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67807" to="ChallengeNodes/Tiles/@AnimatableBody2D@67807/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67807" to="ChallengeNodes/Tiles/@AnimatableBody2D@67807" method="on_shell_block_hit"]
-[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@67807" to="ChallengeNodes/Tiles/@AnimatableBody2D@67807/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35442" to="ChallengeNodes/Tiles/@AnimatableBody2D@35442/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35442" to="ChallengeNodes/Tiles/@AnimatableBody2D@35442/LevelPersistance" method="set_as_active"]
+[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35442" to="ChallengeNodes/Tiles/@AnimatableBody2D@35442" method="check_brick_empty"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35442" to="ChallengeNodes/Tiles/@AnimatableBody2D@35442" method="on_block_hit"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35442" to="ChallengeNodes/Tiles/@AnimatableBody2D@35442/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35442" to="ChallengeNodes/Tiles/@AnimatableBody2D@35442" method="on_shell_block_hit"]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35442" to="ChallengeNodes/Tiles/@AnimatableBody2D@35442/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35443" to="ChallengeNodes/Tiles/@AnimatableBody2D@35443/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35443" to="ChallengeNodes/Tiles/@AnimatableBody2D@35443/LevelPersistance" method="set_as_active"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35443" to="ChallengeNodes/Tiles/@AnimatableBody2D@35443" method="player_mushroom_check"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35443" to="ChallengeNodes/Tiles/@AnimatableBody2D@35443" method="dispense_item" unbinds=1]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35443" to="ChallengeNodes/Tiles/@AnimatableBody2D@35443/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35443" to="ChallengeNodes/Tiles/@AnimatableBody2D@35443" method="dispense_item" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35443" to="ChallengeNodes/Tiles/@AnimatableBody2D@35443/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35444" to="ChallengeNodes/Tiles/@AnimatableBody2D@35444/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35444" to="ChallengeNodes/Tiles/@AnimatableBody2D@35444/LevelPersistance" method="set_as_active"]
+[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35444" to="ChallengeNodes/Tiles/@AnimatableBody2D@35444" method="check_brick_empty"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35444" to="ChallengeNodes/Tiles/@AnimatableBody2D@35444" method="on_block_hit"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35444" to="ChallengeNodes/Tiles/@AnimatableBody2D@35444/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35444" to="ChallengeNodes/Tiles/@AnimatableBody2D@35444" method="on_shell_block_hit"]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35444" to="ChallengeNodes/Tiles/@AnimatableBody2D@35444/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35445" to="ChallengeNodes/Tiles/@AnimatableBody2D@35445/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35445" to="ChallengeNodes/Tiles/@AnimatableBody2D@35445/LevelPersistance" method="set_as_active"]
+[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35445" to="ChallengeNodes/Tiles/@AnimatableBody2D@35445" method="check_brick_empty"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35445" to="ChallengeNodes/Tiles/@AnimatableBody2D@35445" method="on_block_hit"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35445" to="ChallengeNodes/Tiles/@AnimatableBody2D@35445/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35445" to="ChallengeNodes/Tiles/@AnimatableBody2D@35445" method="on_shell_block_hit"]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35445" to="ChallengeNodes/Tiles/@AnimatableBody2D@35445/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35446" to="ChallengeNodes/Tiles/@AnimatableBody2D@35446/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35446" to="ChallengeNodes/Tiles/@AnimatableBody2D@35446/LevelPersistance" method="set_as_active"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35446" to="ChallengeNodes/Tiles/@AnimatableBody2D@35446" method="player_mushroom_check"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35446" to="ChallengeNodes/Tiles/@AnimatableBody2D@35446" method="dispense_item" unbinds=1]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35446" to="ChallengeNodes/Tiles/@AnimatableBody2D@35446/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35446" to="ChallengeNodes/Tiles/@AnimatableBody2D@35446" method="dispense_item" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35446" to="ChallengeNodes/Tiles/@AnimatableBody2D@35446/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35447" to="ChallengeNodes/Tiles/@AnimatableBody2D@35447/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35447" to="ChallengeNodes/Tiles/@AnimatableBody2D@35447/LevelPersistance" method="set_as_active"]
+[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35447" to="ChallengeNodes/Tiles/@AnimatableBody2D@35447" method="check_brick_empty"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35447" to="ChallengeNodes/Tiles/@AnimatableBody2D@35447" method="on_block_hit"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35447" to="ChallengeNodes/Tiles/@AnimatableBody2D@35447/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35447" to="ChallengeNodes/Tiles/@AnimatableBody2D@35447" method="on_shell_block_hit"]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35447" to="ChallengeNodes/Tiles/@AnimatableBody2D@35447/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35448" to="ChallengeNodes/Tiles/@AnimatableBody2D@35448/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35448" to="ChallengeNodes/Tiles/@AnimatableBody2D@35448/LevelPersistance" method="set_as_active"]
+[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35448" to="ChallengeNodes/Tiles/@AnimatableBody2D@35448" method="check_brick_empty"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35448" to="ChallengeNodes/Tiles/@AnimatableBody2D@35448" method="on_block_hit"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35448" to="ChallengeNodes/Tiles/@AnimatableBody2D@35448/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35448" to="ChallengeNodes/Tiles/@AnimatableBody2D@35448" method="on_shell_block_hit"]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35448" to="ChallengeNodes/Tiles/@AnimatableBody2D@35448/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35449" to="ChallengeNodes/Tiles/@AnimatableBody2D@35449/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35449" to="ChallengeNodes/Tiles/@AnimatableBody2D@35449/LevelPersistance" method="set_as_active"]
+[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35449" to="ChallengeNodes/Tiles/@AnimatableBody2D@35449" method="check_brick_empty"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35449" to="ChallengeNodes/Tiles/@AnimatableBody2D@35449" method="on_block_hit"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35449" to="ChallengeNodes/Tiles/@AnimatableBody2D@35449/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35449" to="ChallengeNodes/Tiles/@AnimatableBody2D@35449" method="on_shell_block_hit"]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35449" to="ChallengeNodes/Tiles/@AnimatableBody2D@35449/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35450" to="ChallengeNodes/Tiles/@AnimatableBody2D@35450/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35450" to="ChallengeNodes/Tiles/@AnimatableBody2D@35450/LevelPersistance" method="set_as_active"]
+[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35450" to="ChallengeNodes/Tiles/@AnimatableBody2D@35450" method="check_brick_empty"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35450" to="ChallengeNodes/Tiles/@AnimatableBody2D@35450" method="on_block_hit"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35450" to="ChallengeNodes/Tiles/@AnimatableBody2D@35450/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35450" to="ChallengeNodes/Tiles/@AnimatableBody2D@35450" method="on_shell_block_hit"]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35450" to="ChallengeNodes/Tiles/@AnimatableBody2D@35450/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35451" to="ChallengeNodes/Tiles/@AnimatableBody2D@35451/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35451" to="ChallengeNodes/Tiles/@AnimatableBody2D@35451/LevelPersistance" method="set_as_active"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35451" to="ChallengeNodes/Tiles/@AnimatableBody2D@35451" method="player_mushroom_check"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35451" to="ChallengeNodes/Tiles/@AnimatableBody2D@35451" method="dispense_item" unbinds=1]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35451" to="ChallengeNodes/Tiles/@AnimatableBody2D@35451/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35451" to="ChallengeNodes/Tiles/@AnimatableBody2D@35451" method="dispense_item" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35451" to="ChallengeNodes/Tiles/@AnimatableBody2D@35451/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35452" to="ChallengeNodes/Tiles/@AnimatableBody2D@35452/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35452" to="ChallengeNodes/Tiles/@AnimatableBody2D@35452/LevelPersistance" method="set_as_active"]
+[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35452" to="ChallengeNodes/Tiles/@AnimatableBody2D@35452" method="check_brick_empty"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35452" to="ChallengeNodes/Tiles/@AnimatableBody2D@35452" method="on_block_hit"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35452" to="ChallengeNodes/Tiles/@AnimatableBody2D@35452/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35452" to="ChallengeNodes/Tiles/@AnimatableBody2D@35452" method="on_shell_block_hit"]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35452" to="ChallengeNodes/Tiles/@AnimatableBody2D@35452/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35453" to="ChallengeNodes/Tiles/@AnimatableBody2D@35453/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35453" to="ChallengeNodes/Tiles/@AnimatableBody2D@35453/LevelPersistance" method="set_as_active"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35453" to="ChallengeNodes/Tiles/@AnimatableBody2D@35453" method="player_mushroom_check"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35453" to="ChallengeNodes/Tiles/@AnimatableBody2D@35453" method="dispense_item" unbinds=1]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35453" to="ChallengeNodes/Tiles/@AnimatableBody2D@35453/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35453" to="ChallengeNodes/Tiles/@AnimatableBody2D@35453" method="dispense_item" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35453" to="ChallengeNodes/Tiles/@AnimatableBody2D@35453/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35454" to="ChallengeNodes/Tiles/@AnimatableBody2D@35454/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35454" to="ChallengeNodes/Tiles/@AnimatableBody2D@35454/LevelPersistance" method="set_as_active"]
+[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35454" to="ChallengeNodes/Tiles/@AnimatableBody2D@35454" method="check_brick_empty"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35454" to="ChallengeNodes/Tiles/@AnimatableBody2D@35454" method="on_block_hit"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35454" to="ChallengeNodes/Tiles/@AnimatableBody2D@35454/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35454" to="ChallengeNodes/Tiles/@AnimatableBody2D@35454" method="on_shell_block_hit"]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35454" to="ChallengeNodes/Tiles/@AnimatableBody2D@35454/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35455" to="ChallengeNodes/Tiles/@AnimatableBody2D@35455/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35455" to="ChallengeNodes/Tiles/@AnimatableBody2D@35455/LevelPersistance" method="set_as_active"]
+[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35455" to="ChallengeNodes/Tiles/@AnimatableBody2D@35455" method="check_brick_empty"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35455" to="ChallengeNodes/Tiles/@AnimatableBody2D@35455" method="on_block_hit"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35455" to="ChallengeNodes/Tiles/@AnimatableBody2D@35455/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35455" to="ChallengeNodes/Tiles/@AnimatableBody2D@35455" method="on_shell_block_hit"]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35455" to="ChallengeNodes/Tiles/@AnimatableBody2D@35455/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35456" to="ChallengeNodes/Tiles/@AnimatableBody2D@35456/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35456" to="ChallengeNodes/Tiles/@AnimatableBody2D@35456/LevelPersistance" method="set_as_active"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35456" to="ChallengeNodes/Tiles/@AnimatableBody2D@35456" method="player_mushroom_check"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35456" to="ChallengeNodes/Tiles/@AnimatableBody2D@35456" method="dispense_item" unbinds=1]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35456" to="ChallengeNodes/Tiles/@AnimatableBody2D@35456/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35456" to="ChallengeNodes/Tiles/@AnimatableBody2D@35456" method="dispense_item" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35456" to="ChallengeNodes/Tiles/@AnimatableBody2D@35456/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35457" to="ChallengeNodes/Tiles/@AnimatableBody2D@35457/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35457" to="ChallengeNodes/Tiles/@AnimatableBody2D@35457/LevelPersistance" method="set_as_active"]
+[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35457" to="ChallengeNodes/Tiles/@AnimatableBody2D@35457" method="check_brick_empty"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35457" to="ChallengeNodes/Tiles/@AnimatableBody2D@35457" method="on_block_hit"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35457" to="ChallengeNodes/Tiles/@AnimatableBody2D@35457/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35457" to="ChallengeNodes/Tiles/@AnimatableBody2D@35457" method="on_shell_block_hit"]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35457" to="ChallengeNodes/Tiles/@AnimatableBody2D@35457/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35458" to="ChallengeNodes/Tiles/@AnimatableBody2D@35458/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35458" to="ChallengeNodes/Tiles/@AnimatableBody2D@35458/LevelPersistance" method="set_as_active"]
+[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35458" to="ChallengeNodes/Tiles/@AnimatableBody2D@35458" method="check_brick_empty"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35458" to="ChallengeNodes/Tiles/@AnimatableBody2D@35458" method="on_block_hit"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35458" to="ChallengeNodes/Tiles/@AnimatableBody2D@35458/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35458" to="ChallengeNodes/Tiles/@AnimatableBody2D@35458" method="on_shell_block_hit"]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35458" to="ChallengeNodes/Tiles/@AnimatableBody2D@35458/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35459" to="ChallengeNodes/Tiles/@AnimatableBody2D@35459/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="ChallengeNodes/Tiles/@AnimatableBody2D@35459" to="ChallengeNodes/Tiles/@AnimatableBody2D@35459/LevelPersistance" method="set_as_active"]
+[connection signal="item_changed" from="ChallengeNodes/Tiles/@AnimatableBody2D@35459" to="ChallengeNodes/Tiles/@AnimatableBody2D@35459" method="check_brick_empty"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35459" to="ChallengeNodes/Tiles/@AnimatableBody2D@35459" method="on_block_hit"]
+[connection signal="player_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35459" to="ChallengeNodes/Tiles/@AnimatableBody2D@35459/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35459" to="ChallengeNodes/Tiles/@AnimatableBody2D@35459" method="on_shell_block_hit"]
+[connection signal="shell_block_hit" from="ChallengeNodes/Tiles/@AnimatableBody2D@35459" to="ChallengeNodes/Tiles/@AnimatableBody2D@35459/BlockAnimations" method="bounce_block" unbinds=1]

Scenes/Levels/SMBS/World7/7-4.tscn

@@ -126,13 +126,13 @@ item = ExtResource("17_ekraa")
 [connection signal="player_block_hit" from="Tiles/QuestionBlock" to="Tiles/QuestionBlock/BlockAnimations" method="bounce_block" unbinds=1]
 [connection signal="shell_block_hit" from="Tiles/QuestionBlock" to="Tiles/QuestionBlock" method="dispense_item" unbinds=1]
 [connection signal="shell_block_hit" from="Tiles/QuestionBlock" to="Tiles/QuestionBlock/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@287613" to="Tiles/@AnimatableBody2D@287613/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@287613" to="Tiles/@AnimatableBody2D@287613/LevelPersistance" method="set_as_active"]
-[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@287613" to="Tiles/@AnimatableBody2D@287613" method="player_mushroom_check"]
-[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@287613" to="Tiles/@AnimatableBody2D@287613" method="dispense_item" unbinds=1]
-[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@287613" to="Tiles/@AnimatableBody2D@287613/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@287613" to="Tiles/@AnimatableBody2D@287613" method="dispense_item" unbinds=1]
-[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@287613" to="Tiles/@AnimatableBody2D@287613/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@26079" to="Tiles/@AnimatableBody2D@26079/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@26079" to="Tiles/@AnimatableBody2D@26079/LevelPersistance" method="set_as_active"]
+[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@26079" to="Tiles/@AnimatableBody2D@26079" method="player_mushroom_check"]
+[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@26079" to="Tiles/@AnimatableBody2D@26079" method="dispense_item" unbinds=1]
+[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@26079" to="Tiles/@AnimatableBody2D@26079/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@26079" to="Tiles/@AnimatableBody2D@26079" method="dispense_item" unbinds=1]
+[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@26079" to="Tiles/@AnimatableBody2D@26079/BlockAnimations" method="bounce_block" unbinds=1]
 [connection signal="block_destroyed" from="Tiles/InvisibleQuestionBlock" to="Tiles/InvisibleQuestionBlock/LevelPersistance" method="set_as_active_2"]
 [connection signal="block_emptied" from="Tiles/InvisibleQuestionBlock" to="Tiles/InvisibleQuestionBlock/LevelPersistance" method="set_as_active"]
 [connection signal="player_block_hit" from="Tiles/InvisibleQuestionBlock" to="Tiles/InvisibleQuestionBlock" method="player_mushroom_check"]
@@ -140,24 +140,24 @@ item = ExtResource("17_ekraa")
 [connection signal="player_block_hit" from="Tiles/InvisibleQuestionBlock" to="Tiles/InvisibleQuestionBlock/BlockAnimations" method="bounce_block" unbinds=1]
 [connection signal="shell_block_hit" from="Tiles/InvisibleQuestionBlock" to="Tiles/InvisibleQuestionBlock" method="dispense_item" unbinds=1]
 [connection signal="shell_block_hit" from="Tiles/InvisibleQuestionBlock" to="Tiles/InvisibleQuestionBlock/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@287614" to="Tiles/@AnimatableBody2D@287614/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@287614" to="Tiles/@AnimatableBody2D@287614/LevelPersistance" method="set_as_active"]
-[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@287614" to="Tiles/@AnimatableBody2D@287614" method="player_mushroom_check"]
-[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@287614" to="Tiles/@AnimatableBody2D@287614" method="dispense_item" unbinds=1]
-[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@287614" to="Tiles/@AnimatableBody2D@287614/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@287614" to="Tiles/@AnimatableBody2D@287614" method="dispense_item" unbinds=1]
-[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@287614" to="Tiles/@AnimatableBody2D@287614/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@287615" to="Tiles/@AnimatableBody2D@287615/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@287615" to="Tiles/@AnimatableBody2D@287615/LevelPersistance" method="set_as_active"]
-[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@287615" to="Tiles/@AnimatableBody2D@287615" method="player_mushroom_check"]
-[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@287615" to="Tiles/@AnimatableBody2D@287615" method="dispense_item" unbinds=1]
-[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@287615" to="Tiles/@AnimatableBody2D@287615/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@287615" to="Tiles/@AnimatableBody2D@287615" method="dispense_item" unbinds=1]
-[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@287615" to="Tiles/@AnimatableBody2D@287615/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@287616" to="Tiles/@AnimatableBody2D@287616/LevelPersistance" method="set_as_active_2"]
-[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@287616" to="Tiles/@AnimatableBody2D@287616/LevelPersistance" method="set_as_active"]
-[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@287616" to="Tiles/@AnimatableBody2D@287616" method="player_mushroom_check"]
-[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@287616" to="Tiles/@AnimatableBody2D@287616" method="dispense_item" unbinds=1]
-[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@287616" to="Tiles/@AnimatableBody2D@287616/BlockAnimations" method="bounce_block" unbinds=1]
-[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@287616" to="Tiles/@AnimatableBody2D@287616" method="dispense_item" unbinds=1]
-[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@287616" to="Tiles/@AnimatableBody2D@287616/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@26080" to="Tiles/@AnimatableBody2D@26080/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@26080" to="Tiles/@AnimatableBody2D@26080/LevelPersistance" method="set_as_active"]
+[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@26080" to="Tiles/@AnimatableBody2D@26080" method="player_mushroom_check"]
+[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@26080" to="Tiles/@AnimatableBody2D@26080" method="dispense_item" unbinds=1]
+[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@26080" to="Tiles/@AnimatableBody2D@26080/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@26080" to="Tiles/@AnimatableBody2D@26080" method="dispense_item" unbinds=1]
+[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@26080" to="Tiles/@AnimatableBody2D@26080/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@26081" to="Tiles/@AnimatableBody2D@26081/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@26081" to="Tiles/@AnimatableBody2D@26081/LevelPersistance" method="set_as_active"]
+[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@26081" to="Tiles/@AnimatableBody2D@26081" method="player_mushroom_check"]
+[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@26081" to="Tiles/@AnimatableBody2D@26081" method="dispense_item" unbinds=1]
+[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@26081" to="Tiles/@AnimatableBody2D@26081/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@26081" to="Tiles/@AnimatableBody2D@26081" method="dispense_item" unbinds=1]
+[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@26081" to="Tiles/@AnimatableBody2D@26081/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@26082" to="Tiles/@AnimatableBody2D@26082/LevelPersistance" method="set_as_active_2"]
+[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@26082" to="Tiles/@AnimatableBody2D@26082/LevelPersistance" method="set_as_active"]
+[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@26082" to="Tiles/@AnimatableBody2D@26082" method="player_mushroom_check"]
+[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@26082" to="Tiles/@AnimatableBody2D@26082" method="dispense_item" unbinds=1]
+[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@26082" to="Tiles/@AnimatableBody2D@26082/BlockAnimations" method="bounce_block" unbinds=1]
+[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@26082" to="Tiles/@AnimatableBody2D@26082" method="dispense_item" unbinds=1]
+[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@26082" to="Tiles/@AnimatableBody2D@26082/BlockAnimations" method="bounce_block" unbinds=1]

Scenes/Parts/Particles/BlockDestructionParticles.tscn

@@ -24,7 +24,6 @@ node_to_affect = NodePath("..")
 property_name = "texture"
 mode = 1
 resource_json = ExtResource("4_8gw0u")
-use_cache = false
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
 [node name="TR" type="Node2D" parent="."]
@@ -42,7 +41,6 @@ node_to_affect = NodePath("..")
 property_name = "texture"
 mode = 1
 resource_json = ExtResource("4_8gw0u")
-use_cache = false
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
 [node name="BL" type="Node2D" parent="."]
@@ -60,7 +58,6 @@ node_to_affect = NodePath("..")
 property_name = "texture"
 mode = 1
 resource_json = ExtResource("4_8gw0u")
-use_cache = false
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
 [node name="BR" type="Node2D" parent="."]
@@ -78,7 +75,6 @@ node_to_affect = NodePath("..")
 property_name = "texture"
 mode = 1
 resource_json = ExtResource("4_8gw0u")
-use_cache = false
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
 [node name="Timer" type="Timer" parent="."]

Scenes/Prefabs/Entities/Enemies/Barrel.tscn

@@ -113,8 +113,10 @@ metadata/_custom_type_script = "uid://cmg61722ktg2m"
 script = ExtResource("12_d7wml")
 hitbox = NodePath("../Hitbox")
 
-[connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="destroy" unbinds=1]
+[connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
 [connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]
 [connection signal="explosion_entered" from="ExplosionDetection" to="." method="die_from_object"]

Scenes/Prefabs/Entities/Enemies/Blooper.tscn

@@ -103,6 +103,8 @@ hitbox = NodePath("../Hitbox")
 metadata/_custom_type_script = "uid://ba18grqjixded"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/BobOmb.tscn

@@ -191,6 +191,8 @@ metadata/_custom_type_script = "uid://ba18grqjixded"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
 [connection signal="fireball_hit" from="FireballDetection" to="." method="fireball_hit"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/Boo.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=11 format=3 uid="uid://bpsrc21amnlgb"]
+[gd_scene load_steps=12 format=3 uid="uid://bpsrc21amnlgb"]
 
 [ext_resource type="Script" uid="uid://bbp3jg7yg1700" path="res://Scripts/Classes/Entities/Enemies/Boo.gd" id="1_ilcde"]
 [ext_resource type="Texture2D" uid="uid://c3l6ynlufxcfp" path="res://Assets/Sprites/Enemies/Boo.png" id="1_mkqqf"]
@@ -6,6 +6,7 @@
 [ext_resource type="JSON" path="res://Assets/Sprites/Enemies/Boo.json" id="3_xhmhl"]
 [ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="5_xhmhl"]
 [ext_resource type="Script" uid="uid://d4a7yp6e55u8t" path="res://Scripts/Classes/Components/TrackJoint.gd" id="6_7u2yg"]
+[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="7_wu7y3"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_wu7y3"]
 atlas = ExtResource("1_mkqqf")
@@ -37,12 +38,14 @@ animations = [{
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_ilcde"]
 size = Vector2(12, 12)
 
-[node name="Boo" type="Node2D" groups=["Enemies"]]
+[node name="Boo" type="CharacterBody2D" groups=["Enemies"]]
 script = ExtResource("1_ilcde")
+metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
 
 [node name="Sprite" type="AnimatedSprite2D" parent="."]
 position = Vector2(0, -8)
-scale = Vector2(-1, 1)
+rotation = -3.1415927
+scale = Vector2(1, -1)
 sprite_frames = SubResource("SpriteFrames_i46bk")
 animation = &"WhiteIdle"
 flip_h = true
@@ -74,5 +77,14 @@ script = ExtResource("6_7u2yg")
 disable_physics = false
 metadata/_custom_type_script = "uid://d4a7yp6e55u8t"
 
+[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
+script = ExtResource("7_wu7y3")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [connection signal="killed" from="." to="ScoreNoteSpawner" method="spawn_note" binds= [1000]]
-[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
+[connection signal="killed" from="." to="." method="summon_smoke_particle" unbinds=1]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
+[connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/BooBuddies.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=16 format=3 uid="uid://coasuq2vsmlce"]
+[gd_scene load_steps=17 format=3 uid="uid://coasuq2vsmlce"]
 
 [ext_resource type="Texture2D" uid="uid://c3l6ynlufxcfp" path="res://Assets/Sprites/Enemies/Boo.png" id="1_bek6j"]
 [ext_resource type="Script" uid="uid://djdtghrjbpv2i" path="res://Scripts/Classes/Entities/Enemies/BooBuddies.gd" id="1_vavt3"]
@@ -10,6 +10,7 @@
 [ext_resource type="Script" uid="uid://ctfbuoxtnnl0q" path="res://Scripts/Classes/Components/EditorPropertyExposer.gd" id="6_5b8ig"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="8_ifdhg"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Enemies/BooBuddy.json" id="9_ifdhg"]
+[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="10_al3pe"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_7u2yg"]
 atlas = ExtResource("1_bek6j")
@@ -62,8 +63,9 @@ func _physics_process(delta: float) -> void:
 		idx += 1
 "
 
-[node name="BooBuddies" type="Node2D" groups=["Enemies"]]
+[node name="BooBuddies" type="CharacterBody2D" groups=["Enemies"]]
 script = ExtResource("1_vavt3")
+metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
 
 [node name="RotationJoint" type="Sprite2D" parent="."]
 unique_name_in_owner = true
@@ -106,6 +108,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo1/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo1" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo2" type="Node2D" parent="Boos"]
 visible = false
 
@@ -130,6 +137,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo2/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo2" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo3" type="Node2D" parent="Boos"]
 visible = false
 
@@ -154,6 +166,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo3/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo3" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo4" type="Node2D" parent="Boos"]
 visible = false
 
@@ -178,6 +195,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo4/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo4" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo5" type="Node2D" parent="Boos"]
 visible = false
 
@@ -202,6 +224,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo5/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo5" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo6" type="Node2D" parent="Boos"]
 visible = false
 
@@ -226,6 +253,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo6/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo6" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo7" type="Node2D" parent="Boos"]
 visible = false
 
@@ -250,6 +282,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo7/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo7" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo8" type="Node2D" parent="Boos"]
 visible = false
 
@@ -274,6 +311,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo8/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo8" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo9" type="Node2D" parent="Boos"]
 visible = false
 
@@ -298,6 +340,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo9/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo9" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo10" type="Node2D" parent="Boos"]
 visible = false
 
@@ -322,6 +369,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo10/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo10" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo11" type="Node2D" parent="Boos"]
 visible = false
 
@@ -346,6 +398,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo11/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo11" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo12" type="Node2D" parent="Boos"]
 visible = false
 
@@ -370,6 +427,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo12/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo12" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="BooPositioner" type="Node" parent="."]
 process_mode = 3
 script = SubResource("GDScript_vavt3")
@@ -378,15 +440,27 @@ script = SubResource("GDScript_vavt3")
 script = ExtResource("6_5b8ig")
 properties = Array[String](["length", "direction", "boo_amount", "spread_boos"])
 
-[connection signal="area_entered" from="Boos/Boo1/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo2/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo3/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo4/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo5/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo6/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo7/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo8/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo9/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo10/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo11/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo12/Hitbox" to="." method="on_area_entered"]
+[connection signal="player_hit" from="Boos/Boo1/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo1/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo2/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo2/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo3/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo3/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo4/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo4/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo5/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo5/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo6/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo6/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo7/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo7/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo8/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo8/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo9/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo9/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo10/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo10/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo11/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo11/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo12/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo12/EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/Bowser.tscn

@@ -403,8 +403,8 @@ hitbox = NodePath("../SpriteScaleJoint/Sprite/Hitbox")
 metadata/_custom_type_script = "uid://ba18grqjixded"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
-[connection signal="killed" from="." to="ScoreNoteSpawner" method="spawn_note" binds= [5000]]
 [connection signal="killed" from="." to="." method="show_smoke" unbinds=1]
+[connection signal="killed" from="." to="ScoreNoteSpawner" method="spawn_note" binds= [5000]]
 [connection signal="area_entered" from="SpriteScaleJoint/Sprite/Hitbox" to="." method="on_area_entered"]
 [connection signal="timeout" from="JumpTimer" to="." method="jump"]
 [connection signal="timeout" from="HammerTime" to="." method="throw_hammers"]
@@ -414,6 +414,7 @@ metadata/_custom_type_script = "uid://ba18grqjixded"
 [connection signal="attached" from="TrackJoint" to="MoveAnimation" method="play" binds= ["RESET"]]
 [connection signal="moving_shell_entered" from="ShellDetection" to="ShellDetection" method="destroy_shell"]
 [connection signal="moving_shell_entered" from="ShellDetection" to="." method="fireball_hit" unbinds=1]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
 [connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/BowserFlame.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=10 format=3 uid="uid://blbarreyjem4l"]
+[gd_scene load_steps=11 format=3 uid="uid://blbarreyjem4l"]
 
 [ext_resource type="Texture2D" uid="uid://t5lgshoxlohe" path="res://Assets/Sprites/Items/BowserFlame.png" id="1_4hwux"]
 [ext_resource type="Script" uid="uid://btstbvjk6e6aw" path="res://Scripts/Classes/Entities/Enemies/BowserFlame.gd" id="1_dq7qg"]
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="3_ktnk0"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="4_ktnk0"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/BowserFlame.json" id="5_0e5kh"]
+[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="6_0e5kh"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_iikig"]
 atlas = ExtResource("1_4hwux")
@@ -31,11 +32,13 @@ animations = [{
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_ohhuu"]
 size = Vector2(12, 4)
 
-[node name="BowserFlame" type="Node2D" groups=["Enemies"]]
+[node name="BowserFlame" type="CharacterBody2D" groups=["Enemies"]]
 script = ExtResource("1_dq7qg")
+metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
 
 [node name="Sprite" type="AnimatedSprite2D" parent="."]
-scale = Vector2(-1, 1)
+rotation = -3.1415927
+scale = Vector2(1, -1)
 sprite_frames = SubResource("SpriteFrames_oy8b6")
 autoplay = "default"
 frame_progress = 0.67141116
@@ -60,6 +63,12 @@ shape = SubResource("RectangleShape2D_ohhuu")
 position = Vector2(-2.38419e-07, 0)
 scale = Vector2(1.6, 1)
 
-[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
+[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
+script = ExtResource("6_0e5kh")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [connection signal="screen_entered" from="VisibleOnScreenEnabler2D" to="." method="play_sfx"]
 [connection signal="screen_exited" from="VisibleOnScreenEnabler2D" to="." method="queue_free"]
+[connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/BulletBill.tscn

@@ -80,12 +80,14 @@ script = ExtResource("11_myh77")
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
 [connection signal="screen_entered" from="VisibleOnScreenEnabler2D" to="." method="on_screen_entered"]
 [connection signal="screen_exited" from="VisibleOnScreenEnabler2D" to="OffScreenDespawner" method="on_screen_exited"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
 [connection signal="player_stomped_on" from="EnemyPlayerDetection" to="GibSpawner" method="stomp_die"]
 [connection signal="moving_shell_entered" from="ShellDetection" to="." method="die_from_object"]
-[connection signal="level_start" from="LevelEditorToggleDetection" to="." method="on_screen_entered"]
 [connection signal="level_start" from="LevelEditorToggleDetection" to="." method="_ready"]
+[connection signal="level_start" from="LevelEditorToggleDetection" to="." method="on_screen_entered"]
 [connection signal="explosion_entered" from="ExplosionDetection" to="." method="die_from_object"]
 [connection signal="explosion_entered" from="ExplosionDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]

Scenes/Prefabs/Entities/Enemies/BuzzyBeetle.tscn

@@ -164,12 +164,14 @@ movement_node = NodePath("../BasicEnemyMovement")
 metadata/_custom_type_script = "uid://d4a7yp6e55u8t"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
 [connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="stomped_on"]
-[connection signal="block_bounced" from="BlockBouncingDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="block_bounced" from="BlockBouncingDetection" to="." method="block_bounced" unbinds=1]
+[connection signal="block_bounced" from="BlockBouncingDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="moving_shell_entered" from="ShellDetection" to="." method="die_from_object"]
 [connection signal="icicle_detected" from="IcicleDetection" to="." method="die_from_object"]
 [connection signal="explosion_entered" from="ExplosionDetection" to="." method="die_from_object"]

Scenes/Prefabs/Entities/Enemies/DryBones.tscn

@@ -205,6 +205,8 @@ hitbox = NodePath("../Hitbox")
 metadata/_custom_type_script = "uid://ba18grqjixded"
 
 [connection signal="killed" from="." to="." method="summon_particle" unbinds=1]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/FighterFly.tscn

@@ -191,6 +191,8 @@ hitbox = NodePath("../Hitbox")
 metadata/_custom_type_script = "uid://ba18grqjixded"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [100]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [100]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/Goomba.tscn

@@ -164,6 +164,8 @@ metadata/_custom_type_script = "uid://maqpreddu5kg"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
 [connection signal="killed" from="." to="LevelPersistance" method="set_as_active" unbinds=1]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [100]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/GreenCheepCheep.tscn

@@ -200,6 +200,7 @@ hitbox = NodePath("../Sprite/Hitbox")
 metadata/_custom_type_script = "uid://ba18grqjixded"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
 [connection signal="player_stomped_on" from="EnemyPlayerDetection" to="GibSpawner" method="stomp_die"]

Scenes/Prefabs/Entities/Enemies/GreenKoopaTroopa.tscn

@@ -184,6 +184,8 @@ metadata/_custom_type_script = "uid://maqpreddu5kg"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
 [connection signal="killed" from="." to="LevelPersistance" method="set_as_active" unbinds=1]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
@@ -191,8 +193,8 @@ metadata/_custom_type_script = "uid://maqpreddu5kg"
 [connection signal="player_stomped_on" from="EnemyPlayerDetection" to="LevelPersistance" method="set_as_active" unbinds=1]
 [connection signal="fireball_hit" from="FireballDetection" to="." method="die_from_object"]
 [connection signal="fireball_hit" from="FireballDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
-[connection signal="block_bounced" from="BlockBouncingDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="block_bounced" from="BlockBouncingDetection" to="." method="block_bounced" unbinds=1]
+[connection signal="block_bounced" from="BlockBouncingDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="moving_shell_entered" from="ShellDetection" to="." method="die_from_object"]
 [connection signal="icicle_detected" from="IcicleDetection" to="." method="die_from_object"]
 [connection signal="explosion_entered" from="ExplosionDetection" to="." method="die_from_object"]

Scenes/Prefabs/Entities/Enemies/GreenParaKoopaHori.tscn

@@ -17,3 +17,5 @@ points = PackedVector2Array(0, 0, -96, 0)
 width = 1.0
 texture = ExtResource("3_kfyly")
 texture_mode = 1
+
+[connection signal="block_bounced" from="BlockBouncingDetection" to="." method="block_bounced" unbinds=1]

Scenes/Prefabs/Entities/Enemies/HammerBro.tscn

@@ -313,6 +313,8 @@ metadata/_custom_type_script = "uid://d4a7yp6e55u8t"
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
 [connection signal="timeout" from="JumpTimer" to="." method="jump" binds= [false]]
 [connection signal="timeout" from="HammerTimer" to="." method="do_hammer_throw"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [1000]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [1000]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/Icicle.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" uid="uid://cx0ak5ctcg0mi" path="res://Scripts/Classes/Entities/Enemies/Icicle.gd" id="1_dnx1i"]
 [ext_resource type="Texture2D" uid="uid://rbln0ee0fknc" path="res://Assets/Sprites/Enemies/Icicle.png" id="2_1h8cl"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="3_1h8cl"]
+[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="2_5y583"]
 [ext_resource type="Script" uid="uid://364rywt44hy6" path="res://Scripts/Classes/UI/PackSprite.gd" id="3_dnx1i"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_dnx1i"]
@@ -52,6 +52,11 @@ collision_mask = 55
 script = ExtResource("1_dnx1i")
 metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
 
+[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
+script = ExtResource("2_5y583")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Sprite" type="Sprite2D" parent="."]
 position = Vector2(0, -8)
 texture = ExtResource("2_1h8cl")
@@ -65,8 +70,6 @@ shape = SubResource("RectangleShape2D_dnx1i")
 
 [node name="Hitbox" type="Area2D" parent="."]
 visible = false
-script = ExtResource("3_1h8cl")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
 
 [node name="Shape" type="CollisionShape2D" parent="Hitbox"]
 position = Vector2(0, -6)
@@ -81,5 +84,10 @@ libraries = {
 &"": SubResource("AnimationLibrary_2sios")
 }
 
-[connection signal="player_entered" from="Hitbox" to="." method="damage_player"]
-[connection signal="player_entered" from="Hitbox" to="." method="destroy" unbinds=1]
+[connection signal="killed" from="." to="." method="destroy" unbinds=1]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
+[connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="EnemyPlayerDetection" to="." method="destroy" unbinds=1]
+[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="destroy" unbinds=1]

Scenes/Prefabs/Entities/Enemies/Lakitu.tscn

@@ -181,6 +181,8 @@ metadata/_custom_type_script = "uid://ba18grqjixded"
 [connection signal="killed" from="." to="." method="summon_cloud_particle" unbinds=1]
 [connection signal="screen_entered" from="VisibleOnScreenEnabler2D" to="." method="on_screen_entered"]
 [connection signal="timeout" from="ThrowTimer" to="." method="on_timeout"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" flags=3 binds= [200]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/LeapingCheepCheep.tscn

@@ -105,6 +105,7 @@ hitbox = NodePath("../Hitbox")
 metadata/_custom_type_script = "uid://ba18grqjixded"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
 [connection signal="player_stomped_on" from="EnemyPlayerDetection" to="GibSpawner" method="stomp_die"]

Scenes/Prefabs/Entities/Enemies/MontyMole.tscn

@@ -184,6 +184,8 @@ hitbox = NodePath("../Hitbox")
 metadata/_custom_type_script = "uid://ba18grqjixded"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/Muncher.tscn

@@ -4,10 +4,10 @@
 [ext_resource type="Texture2D" uid="uid://dg7yxoq44gaae" path="res://Assets/Sprites/Enemies/Muncher.png" id="2_ad4wf"]
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="2_fcan1"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="4_6tj01"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="4_ad4wf"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Enemies/Muncher.json" id="5_cgdwi"]
 [ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="5_r7ue2"]
 [ext_resource type="Script" uid="uid://bx6r8sjar6cwr" path="res://Scripts/Classes/Components/BasicStaticMovement.gd" id="8_3kryf"]
+[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="8_cgdwi"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_r7ue2"]
 atlas = ExtResource("2_ad4wf")
@@ -69,11 +69,9 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 shape = SubResource("RectangleShape2D_cgdwi")
 one_way_collision = true
 
-[node name="PlayerDetection" type="Area2D" parent="."]
-script = ExtResource("4_ad4wf")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
+[node name="Hitbox" type="Area2D" parent="."]
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerDetection"]
+[node name="Shape" type="CollisionShape2D" parent="Hitbox"]
 position = Vector2(0, -0.75)
 shape = SubResource("RectangleShape2D_r7ue2")
 
@@ -94,4 +92,10 @@ sync_to_physics = false
 [node name="CollisionShape2D" type="CollisionShape2D" parent="AnimatableBody2D"]
 shape = SubResource("RectangleShape2D_3kryf")
 
-[connection signal="player_entered" from="PlayerDetection" to="." method="damage_player"]
+[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
+script = ExtResource("8_cgdwi")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
+[connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/PiranhaPlant.tscn

@@ -309,6 +309,8 @@ process_mode = 3
 script = SubResource("GDScript_ofvpu")
 
 [connection signal="timeout" from="Timer" to="." method="on_timeout"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/Podoboo.tscn

@@ -81,6 +81,7 @@ metadata/_custom_type_script = "uid://5octqlf4ohel"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib" binds= [0, true]]
 [connection signal="killed" from="." to="ScoreNoteSpawner" method="spawn_note" binds= [500]]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer" unbinds=1]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die" unbinds=1]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
 [connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/Pokey.tscn

@@ -377,6 +377,7 @@ script = SubResource("GDScript_30hxr")
 
 [connection signal="killed" from="." to="." method="summon_part_gibs" unbinds=1]
 [connection signal="fireball_hit" from="FireballDetection" to="." method="die_from_object"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
 [connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/RockyWrench.tscn

@@ -1,11 +1,10 @@
-[gd_scene load_steps=35 format=3 uid="uid://c3m38c2skawpj"]
+[gd_scene load_steps=34 format=3 uid="uid://c3m38c2skawpj"]
 
 [ext_resource type="Script" uid="uid://bfsh8bhcmknkh" path="res://Scripts/Classes/Entities/Enemies/RockyWrench.gd" id="1_pl7bt"]
 [ext_resource type="Texture2D" uid="uid://bfora2lrmtyj4" path="res://Assets/Sprites/Enemies/RockyWrench.png" id="2_8y80u"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_4h1b4"]
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="3_wom81"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Enemies/RockyWrench.json" id="4_pl7bt"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="5_4h1b4"]
 [ext_resource type="Script" uid="uid://bx6r8sjar6cwr" path="res://Scripts/Classes/Components/BasicStaticMovement.gd" id="5_8y80u"]
 [ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="7_pl7bt"]
 [ext_resource type="Texture2D" uid="uid://cop8x5m20cqal" path="res://Assets/Sprites/Items/WrenchProjectile.png" id="7_w66sd"]
@@ -294,8 +293,6 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
 [node name="StompHitbox" type="Area2D" parent="Sprite"]
 position = Vector2(0, -11)
-script = ExtResource("5_4h1b4")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite/StompHitbox"]
 position = Vector2(0, 2.5)
@@ -399,12 +396,13 @@ metadata/_custom_type_script = "uid://cmg61722ktg2m"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
 [connection signal="player_stomped_on" from="Sprite/StompHitbox/EnemyPlayerDetection" to="." method="on_player_stomped_on"]
+[connection signal="hammer_player_hit" from="Sprite/EntityHitbox/EnemyPlayerDetection" to="." method="die_from_hammer"]
 [connection signal="invincible_player_hit" from="Sprite/EntityHitbox/EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="player_hit" from="Sprite/EntityHitbox/EnemyPlayerDetection" to="." method="damage_player"]
 [connection signal="gib_about_to_spawn" from="GibSpawner" to="Sprite/Wrench" method="hide"]
-[connection signal="gib_about_to_spawn" from="GibSpawner" to="Sprite" method="set_flip_v" binds= [true]]
 [connection signal="gib_about_to_spawn" from="GibSpawner" to="Sprite" method="play" binds= ["Dead"]]
 [connection signal="gib_about_to_spawn" from="GibSpawner" to="Sprite" method="set_offset" binds= [Vector2(0, -8)]]
+[connection signal="gib_about_to_spawn" from="GibSpawner" to="Sprite" method="set_flip_v" binds= [true]]
 [connection signal="fireball_hit" from="FireballDetection" to="." method="die_from_object"]
 [connection signal="fireball_hit" from="FireballDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [500]]
 [connection signal="moving_shell_entered" from="ShellDetection" to="." method="die_from_object"]

Scenes/Prefabs/Entities/Enemies/SideStepper.tscn

@@ -146,6 +146,8 @@ hitbox = NodePath("../Hitbox")
 metadata/_custom_type_script = "uid://ba18grqjixded"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [100]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [100]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/Sigebou.tscn

@@ -144,6 +144,8 @@ json_file_path = "res://Assets/Sprites/Enemies/Sigebou.json"
 metadata/_custom_type_script = "uid://cqif1li7otvpl"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [100]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [100]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/Spike.tscn

@@ -297,6 +297,8 @@ hitbox = NodePath("../Hitbox")
 metadata/_custom_type_script = "uid://ba18grqjixded"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [500]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [500]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/Spiny.tscn

@@ -160,6 +160,8 @@ script = ExtResource("14_878x2")
 metadata/_custom_type_script = "uid://33no4mylhh1r"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/Thwomp.tscn

@@ -144,6 +144,7 @@ script = ExtResource("11_jkv5r")
 metadata/_custom_type_script = "uid://5octqlf4ohel"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
 [connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Explosion.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=24 format=3 uid="uid://clbvyne1cr8gp"]
+[gd_scene load_steps=25 format=3 uid="uid://clbvyne1cr8gp"]
 
 [ext_resource type="Script" uid="uid://ritdlvkpyjd4" path="res://Scripts/Classes/Entities/Objects/Explosion.gd" id="1_aklik"]
 [ext_resource type="Texture2D" uid="uid://brjkrkihadwnj" path="res://Assets/Sprites/Particles/FireballExplosion.png" id="2_4aiuq"]
@@ -7,6 +7,7 @@
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="4_hjivi"]
 [ext_resource type="AudioStream" uid="uid://d12v455mw8uvu" path="res://Assets/Audio/SFX/Cannon.wav" id="5_8imqq"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Particles/FireballExplosion.json" id="5_hjivi"]
+[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="8_hjivi"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_vnd2t"]
 atlas = ExtResource("2_4aiuq")
@@ -243,8 +244,9 @@ _data = {
 [sub_resource type="CircleShape2D" id="CircleShape2D_6tdk1"]
 radius = 24.0
 
-[node name="Explosion" type="Node2D"]
+[node name="Explosion" type="CharacterBody2D"]
 script = ExtResource("1_aklik")
+metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
 metadata/is_explosion = true
 
 [node name="Sprite" type="AnimatedSprite2D" parent="."]
@@ -317,5 +319,10 @@ collision_mask = 255
 [node name="Shape" type="CollisionShape2D" parent="Hitbox"]
 shape = SubResource("CircleShape2D_6tdk1")
 
-[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
+[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
+script = ExtResource("8_hjivi")
+hitbox = NodePath("../Hitbox")
+
 [connection signal="body_entered" from="Hitbox" to="." method="on_body_entered"]
+[connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Items/ClockItem.tscn

@@ -1,14 +1,12 @@
-[gd_scene load_steps=16 format=3 uid="uid://rruc6lnk16rr"]
+[gd_scene load_steps=14 format=3 uid="uid://rruc6lnk16rr"]
 
 [ext_resource type="Script" uid="uid://dryofl8epgget" path="res://Scripts/Classes/Entities/Items/ClockItem.gd" id="1_heiyr"]
 [ext_resource type="Texture2D" uid="uid://dal8md4ms07j2" path="res://Assets/Sprites/Items/Clock.png" id="1_ybxan"]
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="2_heiyr"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_ov4xw"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/Clock.json" id="4_newwu"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="5_fg0gx"]
 [ext_resource type="Script" uid="uid://dt2p68xl462v2" path="res://Scripts/Parts/TextShadowColourChanger.gd" id="6_ggci8"]
 [ext_resource type="Script" uid="uid://co6tjg3w6qpd8" path="res://Scripts/Parts/LabelFontChanger.gd" id="7_eol0e"]
-[ext_resource type="Resource" uid="uid://8dcuxbc3h2u2" path="res://Resources/ThemedResources/Font.tres" id="8_34q7a"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_c30tx"]
 atlas = ExtResource("1_ybxan")
@@ -136,8 +134,6 @@ resource_json = ExtResource("4_newwu")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
 [node name="Hitbox" type="Area2D" parent="Sprite"]
-script = ExtResource("5_fg0gx")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite/Hitbox"]
 shape = SubResource("RectangleShape2D_ydslq")
@@ -160,7 +156,6 @@ metadata/_custom_type_script = "uid://dt2p68xl462v2"
 [node name="LabelFontChanger" type="Node" parent="Label" node_paths=PackedStringArray("labels")]
 script = ExtResource("7_eol0e")
 labels = [NodePath("..")]
-resource = ExtResource("8_34q7a")
 metadata/_custom_type_script = "uid://co6tjg3w6qpd8"
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Label"]
@@ -168,4 +163,4 @@ libraries = {
 &"": SubResource("AnimationLibrary_ov4xw")
 }
 
-[connection signal="player_entered" from="Sprite/Hitbox" to="." method="collect_item"]
+[connection signal="area_entered" from="Sprite/Hitbox" to="." method="on_area_entered"]

Scenes/Prefabs/Entities/Items/Hachisuke.tscn

@@ -1,22 +1,21 @@
-[gd_scene load_steps=10 format=3 uid="uid://dn2rawqxpuywe"]
+[gd_scene load_steps=9 format=3 uid="uid://dn2rawqxpuywe"]
 
 [ext_resource type="Script" uid="uid://bb01xttxcem1c" path="res://Scripts/Classes/Entities/Items/Hachisuke.gd" id="1_d7uck"]
 [ext_resource type="Texture2D" uid="uid://bbdcmhyxmc3pu" path="res://Assets/Sprites/Items/SPItems.png" id="2_wdqsg"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_3unjp"]
 [ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="3_eh4yc"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="4_3unjp"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/Hachisuke.json" id="4_db2kr"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_qj4fn"]
 atlas = ExtResource("2_wdqsg")
 region = Rect2(0, 0, 16, 16)
 
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_kn7db"]
-size = Vector2(12, 12)
-
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_6c253"]
 size = Vector2(16, 16)
 
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_8f4k7"]
+size = Vector2(12, 12)
+
 [node name="Hachisuke" type="CharacterBody2D"]
 collision_layer = 8
 collision_mask = 6
@@ -40,18 +39,14 @@ script = ExtResource("3_eh4yc")
 add_score = true
 metadata/_custom_type_script = "uid://5octqlf4ohel"
 
-[node name="PlayerDetection" type="Area2D" parent="."]
-position = Vector2(0, -8)
-script = ExtResource("4_3unjp")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
-
-[node name="Shape" type="CollisionShape2D" parent="PlayerDetection"]
-shape = SubResource("RectangleShape2D_kn7db")
-
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 position = Vector2(0, -8)
 shape = SubResource("RectangleShape2D_6c253")
 
-[connection signal="player_entered" from="PlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [8000]]
-[connection signal="player_entered" from="PlayerDetection" to="." method="play_sfx" unbinds=1]
-[connection signal="player_entered" from="PlayerDetection" to="." method="queue_free" unbinds=1]
+[node name="Hitbox" type="Area2D" parent="."]
+position = Vector2(0, -8)
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
+shape = SubResource("RectangleShape2D_8f4k7")
+
+[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]

Scenes/Prefabs/Entities/Items/Hammer.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=10 format=3 uid="uid://deo08vl26nc4b"]
+[gd_scene load_steps=11 format=3 uid="uid://hqrc7ujinbcq"]
 
 [ext_resource type="Script" uid="uid://s1utdly4mtbi" path="res://Scripts/Classes/Entities/Items/Hammer.gd" id="1_3ojke"]
 [ext_resource type="Texture2D" uid="uid://3xmhfi556p3s" path="res://Assets/Sprites/Items/Hammer.png" id="1_o34jf"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_k3c6x"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/Hammer.json" id="4_pmlpp"]
+[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="5_pmlpp"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_2tvg3"]
 atlas = ExtResource("1_o34jf")
@@ -51,17 +52,17 @@ _data = {
 [sub_resource type="CircleShape2D" id="CircleShape2D_pmlpp"]
 radius = 4.0
 
-[node name="Hammer" type="Node2D" groups=["Enemies"]]
+[node name="Hammer" type="CharacterBody2D" groups=["Enemies"]]
 script = ExtResource("1_3ojke")
+metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
 
 [node name="Sprite" type="Sprite2D" parent="."]
 physics_interpolation_mode = 2
 texture = SubResource("AtlasTexture_2tvg3")
 
-[node name="ResourceSetterNew" type="Node" parent="Sprite" node_paths=PackedStringArray("node_to_affect", "property_node")]
+[node name="ResourceSetterNew" type="Node" parent="Sprite" node_paths=PackedStringArray("node_to_affect")]
 script = ExtResource("3_k3c6x")
 node_to_affect = NodePath("..")
-property_node = NodePath("../..")
 property_name = "texture"
 mode = 1
 resource_json = ExtResource("4_pmlpp")
@@ -78,4 +79,9 @@ autoplay = "Rotate"
 [node name="Shape" type="CollisionShape2D" parent="Hitbox"]
 shape = SubResource("CircleShape2D_pmlpp")
 
-[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
+[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
+script = ExtResource("5_pmlpp")
+hitbox = NodePath("../Hitbox")
+
+[connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Items/HammerItem.tscn

@@ -1,31 +1,22 @@
-[gd_scene load_steps=8 format=3 uid="uid://bwdwavf4rp1m1"]
+[gd_scene load_steps=7 format=3 uid="uid://bwdwavf4rp1m1"]
 
 [ext_resource type="Script" uid="uid://vhxup1pn2v8q" path="res://Scripts/Classes/Entities/Items/HammerItem.gd" id="1_ws752"]
 [ext_resource type="Texture2D" uid="uid://bbdcmhyxmc3pu" path="res://Assets/Sprites/Items/SPItems.png" id="2_c0srl"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="3_uc7h7"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="4_uc7h7"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/HammerItem.json" id="5_6qq3q"]
 
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_ws752"]
-size = Vector2(8, 8)
-
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_uc7h7"]
 size = Vector2(10, 10)
 
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_ws752"]
+size = Vector2(12, 12)
+
 [node name="HammerItem" type="CharacterBody2D"]
 collision_layer = 8
 collision_mask = 2
 script = ExtResource("1_ws752")
 metadata/_custom_type_script = "uid://cjkurwybsaywm"
 
-[node name="Hitbox" type="Area2D" parent="."]
-script = ExtResource("3_uc7h7")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
-
-[node name="Shape" type="CollisionShape2D" parent="Hitbox"]
-position = Vector2(0, -8)
-shape = SubResource("RectangleShape2D_ws752")
-
 [node name="Sprite" type="Sprite2D" parent="."]
 position = Vector2(0, -8)
 texture = ExtResource("2_c0srl")
@@ -44,4 +35,10 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 position = Vector2(0, -5)
 shape = SubResource("RectangleShape2D_uc7h7")
 
-[connection signal="player_entered" from="Hitbox" to="." method="on_player_entered"]
+[node name="Hitbox" type="Area2D" parent="."]
+position = Vector2(0, -8)
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
+shape = SubResource("RectangleShape2D_ws752")
+
+[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]

Scenes/Prefabs/Entities/Items/KeyItem.tscn

@@ -1,10 +1,9 @@
-[gd_scene load_steps=18 format=3 uid="uid://ny5glffi0suh"]
+[gd_scene load_steps=17 format=3 uid="uid://ny5glffi0suh"]
 
 [ext_resource type="Texture2D" uid="uid://bagrao4ahra76" path="res://Assets/Sprites/Items/Key.png" id="1_883rn"]
 [ext_resource type="Script" uid="uid://cjgbt7iof66j0" path="res://Scripts/Classes/Entities/Items/KeyItem.gd" id="1_l02ex"]
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="2_ecusj"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_l02ex"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="3_m8uts"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/Key.json" id="4_m8uts"]
 [ext_resource type="Texture2D" uid="uid://sgrcmlktp2dk" path="res://Assets/Sprites/Particles/SRankParticles.png" id="7_2yl70"]
 
@@ -146,8 +145,6 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
 [node name="Hitbox" type="Area2D" parent="."]
 position = Vector2(0, -8)
-script = ExtResource("3_m8uts")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
 shape = SubResource("RectangleShape2D_2u37r")
@@ -166,4 +163,4 @@ texture = ExtResource("7_2yl70")
 randomness = 0.12
 process_material = SubResource("ParticleProcessMaterial_rls2x")
 
-[connection signal="player_entered" from="Hitbox" to="." method="collected" unbinds=1]
+[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]

Scenes/Prefabs/Entities/Items/LuckyStar.tscn

@@ -1,18 +1,18 @@
-[gd_scene load_steps=11 format=3 uid="uid://dhd0gp2xvl53l"]
+[gd_scene load_steps=10 format=3 uid="uid://dhd0gp2xvl53l"]
 
 [ext_resource type="Script" uid="uid://bafdl3y53ly60" path="res://Scripts/Classes/UI/PackAnimatedSprite2D.gd" id="2_724cb"]
 [ext_resource type="Texture2D" uid="uid://bbdcmhyxmc3pu" path="res://Assets/Sprites/Items/SPItems.png" id="2_wnlnm"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="3_724cb"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_ke2o5"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/LuckyStar.json" id="4_4cwfa"]
 
 [sub_resource type="GDScript" id="GDScript_y0edb"]
 script/source = "extends PowerUpItem
 
-func player_entered(_player: Player) -> void:
-	queue_free()
-	AudioManager.play_global_sfx(\"lucky_star\")
-	get_tree().call_group(\"Enemies\", \"flag_die\")
+func on_area_entered(area: Area2D) -> void:
+	if area.owner is Player:
+		queue_free()
+		AudioManager.play_global_sfx(\"lucky_star\")
+		get_tree().call_group(\"Enemies\", \"flag_die\")
 "
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_ke2o5"]
@@ -59,12 +59,10 @@ property_name = "sprite_frames"
 resource_json = ExtResource("4_4cwfa")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
-[node name="PlayerDetection" type="Area2D" parent="."]
+[node name="Hitbox" type="Area2D" parent="."]
 position = Vector2(0, -8)
-script = ExtResource("3_724cb")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerDetection"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
 shape = SubResource("RectangleShape2D_7yv5x")
 
-[connection signal="player_entered" from="PlayerDetection" to="." method="player_entered"]
+[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]

Scenes/Prefabs/Entities/Items/RedCoin.tscn

@@ -1,10 +1,9 @@
-[gd_scene load_steps=18 format=3 uid="uid://cmbpqnq10arts"]
+[gd_scene load_steps=17 format=3 uid="uid://cmbpqnq10arts"]
 
 [ext_resource type="Script" uid="uid://xwq5ac650e76" path="res://Scripts/Classes/Entities/Items/RedCoin.gd" id="1_c6tmk"]
 [ext_resource type="Texture2D" uid="uid://c8wpxm7b5tgiq" path="res://Assets/Sprites/Items/RedCoin.png" id="2_lwdcj"]
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="3_0r8d3"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_0xloa"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="3_onh0k"]
 [ext_resource type="Script" uid="uid://cmg61722ktg2m" path="res://Scripts/Classes/Components/BlockBouncingDetection.gd" id="4_lwdcj"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/RedCoin.json" id="5_0fjrw"]
 
@@ -103,8 +102,6 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
 [node name="Hitbox" type="Area2D" parent="."]
 collision_mask = 5
-script = ExtResource("3_onh0k")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
 
 [node name="Shape" type="CollisionShape2D" parent="Hitbox"]
 position = Vector2(0, 1.5)
@@ -113,8 +110,8 @@ shape = SubResource("RectangleShape2D_4qu2r")
 [node name="BlockBouncingDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
 script = ExtResource("4_lwdcj")
 detection_type = 1
-hitbox = NodePath("../Hitbox")
+hitbox = NodePath("")
 metadata/_custom_type_script = "uid://cmg61722ktg2m"
 
-[connection signal="player_entered" from="Hitbox" to="." method="on_player_entered"]
+[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
 [connection signal="block_bounced" from="BlockBouncingDetection" to="." method="summon_bounced_coin" unbinds=1]

Scenes/Prefabs/Entities/Items/WingItem.tscn

@@ -1,8 +1,7 @@
-[gd_scene load_steps=10 format=3 uid="uid://ck0spcws71sg5"]
+[gd_scene load_steps=9 format=3 uid="uid://ck0spcws71sg5"]
 
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="1_fcvyr"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="2_gjj3y"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="2_neobf"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/WingItem.json" id="3_1uenh"]
 [ext_resource type="Script" uid="uid://bx6r8sjar6cwr" path="res://Scripts/Classes/Components/BasicStaticMovement.gd" id="3_143ya"]
 [ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="4_gdso8"]
@@ -10,10 +9,13 @@
 [sub_resource type="GDScript" id="GDScript_gdso8"]
 script/source = "extends PowerUpItem
 
-func player_entered(player: Player) -> void:
-	AudioManager.play_sfx(\"power_up\", global_position)
-	player.wing_get()
-	queue_free()
+func on_area_entered(area: Area2D) -> void:
+	if area.owner is Player:
+		AudioManager.play_sfx(\"power_up\", global_position)
+		Global.score += 1000
+		$ScoreNoteSpawner.spawn_note(1000)
+		area.owner.wing_get()
+		queue_free()
 "
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_fcvyr"]
@@ -42,8 +44,6 @@ resource_json = ExtResource("3_1uenh")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
 [node name="Hitbox" type="Area2D" parent="."]
-script = ExtResource("2_neobf")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
 position = Vector2(0, -8)
@@ -62,5 +62,4 @@ script = ExtResource("4_gdso8")
 add_score = true
 metadata/_custom_type_script = "uid://5octqlf4ohel"
 
-[connection signal="player_entered" from="Hitbox" to="." method="player_entered"]
-[connection signal="player_entered" from="Hitbox" to="ScoreNoteSpawner" method="spawn_note" binds= [1000]]
+[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]

Scenes/Prefabs/Entities/Objects/BobOmbHeld.tscn

@@ -253,6 +253,7 @@ hitbox = NodePath("../Hitbox")
 metadata/_custom_type_script = "uid://ba18grqjixded"
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="kick"]
 [connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="kick"]

Scenes/Prefabs/Entities/Objects/Bumper.tscn

@@ -84,12 +84,12 @@ property_name = "sprite_frames"
 resource_json = ExtResource("5_ix70v")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
-[node name="Hitbox" type="Area2D" parent="."]
+[node name="PlayerDetection" type="Area2D" parent="."]
 collision_layer = 255
 script = ExtResource("3_cgc3p")
 metadata/_custom_type_script = "uid://cnheej0sxmoxg"
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerDetection"]
 shape = SubResource("CircleShape2D_tbo6k")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
@@ -107,4 +107,4 @@ metadata/_custom_type_script = "uid://d4a7yp6e55u8t"
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource("RectangleShape2D_tbo6k")
 
-[connection signal="player_entered" from="Hitbox" to="." method="bounce_player"]
+[connection signal="player_entered" from="PlayerDetection" to="." method="bounce_player"]

Scenes/Prefabs/Entities/Objects/Burner.tscn

@@ -4,10 +4,10 @@
 [ext_resource type="Texture2D" uid="uid://dhk5jdqjqo77p" path="res://Assets/Sprites/Blocks/BurnerFlame.png" id="1_vrk50"]
 [ext_resource type="Texture2D" uid="uid://4l2medldwrwh" path="res://Assets/Sprites/Blocks/Burner.png" id="2_4fveq"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_fsldu"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="3_sqxap"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Blocks/BurnerFlame.json" id="4_m4qew"]
 [ext_resource type="Script" uid="uid://ctfbuoxtnnl0q" path="res://Scripts/Classes/Components/EditorPropertyExposer.gd" id="5_sqxap"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Blocks/BurnerBlock.json" id="5_w52fl"]
+[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="7_m4qew"]
 [ext_resource type="Script" uid="uid://cqif1li7otvpl" path="res://Scripts/Parts/SpriteFramesToJsonConverter.gd" id="7_w52fl"]
 [ext_resource type="Script" uid="uid://cmvlgsjmsk0v5" path="res://Scripts/Classes/Resources/ThemedResource.gd" id="8_oeevx"]
 [ext_resource type="Script" uid="uid://d4a7yp6e55u8t" path="res://Scripts/Classes/Components/TrackJoint.gd" id="10_oeevx"]
@@ -205,16 +205,19 @@ mode = 1
 resource_json = ExtResource("5_w52fl")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
-[node name="PlayerDetection" type="Area2D" parent="RotationJoint"]
-script = ExtResource("3_sqxap")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
+[node name="Hitbox" type="Area2D" parent="RotationJoint"]
 
-[node name="Hitbox" type="CollisionShape2D" parent="RotationJoint/PlayerDetection"]
+[node name="Shape" type="CollisionShape2D" parent="RotationJoint/Hitbox"]
 unique_name_in_owner = true
 position = Vector2(0, -32)
 shape = SubResource("RectangleShape2D_jssei")
 disabled = true
 
+[node name="EnemyPlayerDetection" type="Node" parent="RotationJoint" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("7_m4qew")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Timer" type="Timer" parent="."]
 wait_time = 3.0
 one_shot = true
@@ -241,5 +244,6 @@ offset = Vector2(0, 0)
 disable_physics = false
 metadata/_custom_type_script = "uid://d4a7yp6e55u8t"
 
-[connection signal="player_entered" from="RotationJoint/PlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="RotationJoint/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="RotationJoint/EnemyPlayerDetection" to="." method="damage_player"]
 [connection signal="timeout" from="Timer" to="." method="do_cycle"]

Scenes/Prefabs/Entities/Objects/BuzzyBeetleShell.tscn

@@ -95,6 +95,7 @@ position = Vector2(0, -8)
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
 [connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="on_player_hit"]
 [connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="on_player_stomped_on"]

Scenes/Prefabs/Entities/Objects/CannonBall.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=9 format=3 uid="uid://bumvqjhs2xxka"]
+[gd_scene load_steps=8 format=3 uid="uid://bumvqjhs2xxka"]
 
 [ext_resource type="Script" uid="uid://bfdtqldkrv4dn" path="res://Scripts/Classes/Entities/Enemies/CannonBall.gd" id="1_yim3j"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="2_il73j"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="2_yim3j"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Enemies/CannonBall.json" id="3_874xq"]
 [ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="3_pydrn"]
@@ -28,16 +27,14 @@ mode = 1
 resource_json = ExtResource("3_874xq")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
-[node name="PlayerDetection" type="Area2D" parent="."]
-script = ExtResource("2_il73j")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
+[node name="Hitbox" type="Area2D" parent="."]
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerDetection"]
+[node name="Shape" type="CollisionShape2D" parent="Hitbox"]
 shape = SubResource("RectangleShape2D_yim3j")
 
 [node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
 script = ExtResource("3_pydrn")
-hitbox = NodePath("../PlayerDetection")
+hitbox = NodePath("../Hitbox")
 height = 0
 metadata/_custom_type_script = "uid://chj8hu207lrh"
 
@@ -52,6 +49,8 @@ metadata/_custom_type_script = "uid://c3gg32ivrlq8n"
 script = ExtResource("5_il73j")
 metadata/_custom_type_script = "uid://5octqlf4ohel"
 
+[connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
 [connection signal="player_stomped_on" from="EnemyPlayerDetection" to="GibSpawner" method="stomp_die"]

Scenes/Prefabs/Entities/Objects/Firebar.tscn

@@ -32,7 +32,7 @@ func _physics_process(delta: float) -> void:
 		$RotationJoint.global_rotation_degrees = snapped(bar_rotation, 11.25)
 
 func on_area_entered(area: Area2D) -> void:
-	if area.owner is Player:
+	if area.owner is Player and area.name != \"HammerHitbox\":
 		area.owner.damage()
 "
 

Scenes/Prefabs/Entities/Objects/GreenKoopaShell.tscn

@@ -168,6 +168,8 @@ rect = Rect2(-128, -128, 256, 256)
 
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
 [connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="on_player_hit"]

Scenes/Prefabs/Entities/Objects/LongFirebar.tscn

@@ -4,7 +4,7 @@
 [ext_resource type="Texture2D" uid="uid://pidoncb5gcax" path="res://Assets/Sprites/Items/Fireball.png" id="2_s1hms"]
 
 [sub_resource type="SegmentShape2D" id="SegmentShape2D_s77o2"]
-b = Vector2(0, 80)
+b = Vector2(0, -40)
 
 [sub_resource type="Animation" id="Animation_vag0n"]
 length = 0.001
@@ -47,31 +47,31 @@ _data = {
 
 [node name="Firebar" instance=ExtResource("1_m6o3e")]
 
-[node name="RemoteTransform2D17" type="RemoteTransform2D" parent="RotationJoint" index="6"]
+[node name="RemoteTransform2D19" type="RemoteTransform2D" parent="RotationJoint" index="6"]
 position = Vector2(0, 48)
 remote_path = NodePath("../../Fireballs/Fireball7")
 update_rotation = false
 update_scale = false
 
-[node name="RemoteTransform2D18" type="RemoteTransform2D" parent="RotationJoint" index="7"]
+[node name="RemoteTransform2D20" type="RemoteTransform2D" parent="RotationJoint" index="7"]
 position = Vector2(0, 56)
 remote_path = NodePath("../../Fireballs/Fireball8")
 update_rotation = false
 update_scale = false
 
-[node name="RemoteTransform2D19" type="RemoteTransform2D" parent="RotationJoint" index="8"]
+[node name="RemoteTransform2D21" type="RemoteTransform2D" parent="RotationJoint" index="8"]
 position = Vector2(0, 64)
 remote_path = NodePath("../../Fireballs/Fireball9")
 update_rotation = false
 update_scale = false
 
-[node name="RemoteTransform2D20" type="RemoteTransform2D" parent="RotationJoint" index="9"]
+[node name="RemoteTransform2D22" type="RemoteTransform2D" parent="RotationJoint" index="9"]
 position = Vector2(0, 72)
 remote_path = NodePath("../../Fireballs/Fireball10")
 update_rotation = false
 update_scale = false
 
-[node name="RemoteTransform2D21" type="RemoteTransform2D" parent="RotationJoint" index="10"]
+[node name="RemoteTransform2D23" type="RemoteTransform2D" parent="RotationJoint" index="10"]
 position = Vector2(0, 80)
 remote_path = NodePath("../../Fireballs/Fireball11")
 update_rotation = false
@@ -84,23 +84,28 @@ shape = SubResource("SegmentShape2D_s77o2")
 z_index = 4096
 z_as_relative = false
 
-[node name="Fireball17" type="Sprite2D" parent="Fireballs" index="6"]
+[node name="Fireball19" type="Sprite2D" parent="Fireballs" index="6"]
+visible = false
 position = Vector2(33.9411, 33.9411)
 texture = ExtResource("2_s1hms")
 
-[node name="Fireball18" type="Sprite2D" parent="Fireballs" index="7"]
+[node name="Fireball20" type="Sprite2D" parent="Fireballs" index="7"]
+visible = false
 position = Vector2(39.598, 39.598)
 texture = ExtResource("2_s1hms")
 
-[node name="Fireball19" type="Sprite2D" parent="Fireballs" index="8"]
+[node name="Fireball21" type="Sprite2D" parent="Fireballs" index="8"]
+visible = false
 position = Vector2(45.2548, 45.2548)
 texture = ExtResource("2_s1hms")
 
-[node name="Fireball20" type="Sprite2D" parent="Fireballs" index="9"]
+[node name="Fireball22" type="Sprite2D" parent="Fireballs" index="9"]
+visible = false
 position = Vector2(50.9117, 50.9117)
 texture = ExtResource("2_s1hms")
 
-[node name="Fireball21" type="Sprite2D" parent="Fireballs" index="10"]
+[node name="Fireball23" type="Sprite2D" parent="Fireballs" index="10"]
+visible = false
 position = Vector2(56.5685, 56.5686)
 texture = ExtResource("2_s1hms")
 

Scenes/Prefabs/Entities/Objects/WrenchProjectile.tscn

@@ -1,9 +1,8 @@
-[gd_scene load_steps=14 format=3 uid="uid://p42vcj0qmhxl"]
+[gd_scene load_steps=13 format=3 uid="uid://p42vcj0qmhxl"]
 
 [ext_resource type="Texture2D" uid="uid://cop8x5m20cqal" path="res://Assets/Sprites/Items/WrenchProjectile.png" id="1_bh1cs"]
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="2_wtsxo"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_7wlxe"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="3_tfqn5"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/WrenchProjectile.json" id="4_5s4r1"]
 [ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="4_7wlxe"]
 
@@ -85,16 +84,14 @@ property_name = "sprite_frames"
 resource_json = ExtResource("4_5s4r1")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
-[node name="PlayerDetection" type="Area2D" parent="."]
-script = ExtResource("3_tfqn5")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
+[node name="Hitbox" type="Area2D" parent="."]
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerDetection"]
+[node name="Shape" type="CollisionShape2D" parent="Hitbox"]
 shape = SubResource("CircleShape2D_srvot")
 
 [node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
 script = ExtResource("4_7wlxe")
-hitbox = NodePath("../PlayerDetection")
+hitbox = NodePath("../Hitbox")
 metadata/_custom_type_script = "uid://chj8hu207lrh"
 
 [node name="VisibleOnScreenEnabler2D" type="VisibleOnScreenEnabler2D" parent="."]

Scenes/Prefabs/Entities/Player.tscn

@@ -540,9 +540,11 @@ resource_json = ExtResource("7_2mfvl")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
 [node name="HammerHitbox" type="Area2D" parent="SpriteScaleJoint/Sprite"]
+unique_name_in_owner = true
 visible = false
 position = Vector2(16, 16)
-monitorable = false
+collision_layer = 0
+collision_mask = 0
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="SpriteScaleJoint/Sprite/HammerHitbox"]
 position = Vector2(-3.49691e-07, -8)
@@ -1138,7 +1140,6 @@ anim_speed_max = 1.0
 
 [connection signal="frame_changed" from="SpriteScaleJoint/Sprite" to="SpriteScaleJoint/Sprite" method="on_frame_changed"]
 [connection signal="sprite_frames_changed" from="SpriteScaleJoint/Sprite" to="SpriteScaleJoint/Sprite" method="on_frame_changed"]
-[connection signal="area_entered" from="SpriteScaleJoint/Sprite/HammerHitbox" to="." method="on_hammer_area_entered"]
 [connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
 [connection signal="area_exited" from="Hitbox" to="." method="on_area_exited"]
 [connection signal="body_entered" from="LavaPoisonDetect" to="." method="die" unbinds=1]

Scenes/Prefabs/GameHud.tscn

@@ -23,7 +23,6 @@
 [ext_resource type="Script" uid="uid://dwtrmo82e12ud" path="res://Scripts/Parts/ColourPaletteSampler.gd" id="15_8qasw"]
 [ext_resource type="Script" uid="uid://co6tjg3w6qpd8" path="res://Scripts/Parts/LabelFontChanger.gd" id="15_jwl8o"]
 [ext_resource type="PackedScene" uid="uid://n2e3jgmkilvt" path="res://Scenes/Prefabs/UI/MarathonResults.tscn" id="16_cfljn"]
-[ext_resource type="FontVariation" uid="uid://djxdgxy1iv8yv" path="res://Resources/ThemedResources/FontLLMain.tres" id="17_2w8b3"]
 [ext_resource type="PackedScene" uid="uid://b85i7uni0twpe" path="res://Scenes/Prefabs/UI/DiscoResults.tscn" id="17_ocsy5"]
 [ext_resource type="Script" uid="uid://dt2p68xl462v2" path="res://Scripts/Parts/TextShadowColourChanger.gd" id="18_jwl8o"]
 [ext_resource type="Texture2D" uid="uid://w74s6oi3l8k8" path="res://Assets/Sprites/UI/TextShadowColours.png" id="24_h6dkv"]
@@ -245,7 +244,6 @@ offset_left = 4.0
 offset_top = -12.0
 offset_right = 36.0
 offset_bottom = 4.0
-theme_override_fonts/font = ExtResource("17_2w8b3")
 text = "*03"
 
 [node name="CoinIcon" type="AnimatedSprite2D" parent="Main/CoinCount"]
@@ -270,7 +268,6 @@ offset_left = 4.0
 offset_top = -4.0
 offset_right = 36.0
 offset_bottom = 12.0
-theme_override_fonts/font = ExtResource("17_2w8b3")
 text = "*00"
 
 [node name="RedCoins" type="Control" parent="Main"]
@@ -931,7 +928,6 @@ offset_left = 4.0
 offset_top = -12.0
 offset_right = 36.0
 offset_bottom = 4.0
-theme_override_fonts/font = ExtResource("17_2w8b3")
 text = "*03"
 
 [node name="Right" type="Control" parent="ModernHUD"]

Scenes/Prefabs/Global.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=56 format=3 uid="uid://c3h2iqkvitqd2"]
+[gd_scene load_steps=58 format=3 uid="uid://c3h2iqkvitqd2"]
 
 [ext_resource type="PackedScene" uid="uid://bod0jkf7jc5pm" path="res://Scenes/Prefabs/GameHud.tscn" id="1_ctvpw"]
 [ext_resource type="Script" uid="uid://bbxqn16ekbpcl" path="res://Scripts/Classes/Singletons/Global.gd" id="1_t23sr"]
@@ -23,6 +23,8 @@
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="19_okfpr"]
 [ext_resource type="Texture2D" uid="uid://bhgjvnslkt143" path="res://Assets/Sprites/UI/PanelSelected.png" id="19_xspbb"]
 [ext_resource type="JSON" path="res://Assets/Sprites/UI/Cursor.json" id="20_3l3ph"]
+[ext_resource type="JSON" path="res://Assets/Sprites/UI/FontMain.json" id="23_3l3ph"]
+[ext_resource type="JSON" path="res://Assets/Sprites/UI/ScoreFont.json" id="24_m6bur"]
 
 [sub_resource type="Animation" id="Animation_6jmk5"]
 resource_name = "FadeIn"
@@ -308,6 +310,21 @@ libraries = {
 [node name="GameHUD" parent="." instance=ExtResource("1_ctvpw")]
 layer = 1
 
+[node name="FPSCount" type="Label" parent="GameHUD"]
+unique_name_in_owner = true
+visible = false
+anchors_preset = 3
+anchor_left = 1.0
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = -56.0
+offset_top = -16.0
+grow_horizontal = 0
+grow_vertical = 0
+text = "120FPS"
+horizontal_alignment = 2
+
 [node name="ScoreTally" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("3_vjpdy")
 bus = &"SFX"
@@ -426,9 +443,25 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 script = ExtResource("18_1la0o")
 metadata/_custom_type_script = "uid://ctsjagoa5t33f"
 
+[node name="MainFontGetter" type="Node" parent="FontUpdater" node_paths=PackedStringArray("node_to_affect")]
+script = ExtResource("19_okfpr")
+node_to_affect = NodePath("..")
+property_name = "main_font"
+mode = 4
+resource_json = ExtResource("23_3l3ph")
+metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
+
+[node name="ScoreFontGetter" type="Node" parent="FontUpdater" node_paths=PackedStringArray("node_to_affect")]
+script = ExtResource("19_okfpr")
+node_to_affect = NodePath("..")
+property_name = "score_font"
+mode = 4
+resource_json = ExtResource("24_m6bur")
+metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
+
 [node name="TextShadowColourChanger" type="Node" parent="." node_paths=PackedStringArray("labels")]
 script = ExtResource("19_l7dvb")
-labels = [NodePath("../CanvasLayer/VBoxContainer/ErrorMessage"), NodePath("../CanvasLayer/VBoxContainer/Comment"), NodePath("../CanvasLayer/VBoxContainer/Warning")]
+labels = [NodePath("../CanvasLayer/VBoxContainer/ErrorMessage"), NodePath("../CanvasLayer/VBoxContainer/Comment"), NodePath("../CanvasLayer/VBoxContainer/Warning"), NodePath("../GameHUD/FPSCount")]
 metadata/_custom_type_script = "uid://dt2p68xl462v2"
 
 [connection signal="finished" from="ScoreTally" to="." method="on_score_sfx_finished"]

Scenes/Prefabs/UI/BasePauseMenu.tscn

@@ -99,17 +99,5 @@ metadata/_custom_type_script = "uid://co6tjg3w6qpd8"
 layout_mode = 1
 disabled_containers = [NodePath("PanelContainer/MarginContainer/VBoxContainer/Difficulty"), NodePath("PanelContainer/MarginContainer/VBoxContainer/Data")]
 
-[node name="Label" parent="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/ResourcePacks" index="0"]
-visible = true
-
-[node name="LabelFontChanger" parent="SettingsMenu" index="1" node_paths=PackedStringArray("labels")]
-labels = [NodePath("../PanelContainer/MarginContainer/VBoxContainer/Title"), NodePath("../PanelContainer/MarginContainer/VBoxContainer/CategorySelect/HBoxContainer/Category"), null, null, null, null, null, null, null, NodePath("../PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode/Value"), null, NodePath("../PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode2/Value"), null, NodePath("../PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode3/Value"), NodePath("../PanelContainer/MarginContainer/VBoxContainer/Difficulty/Description/AutoScrollContainer/MarginContainer/Desc")]
-
 [connection signal="closed" from="." to="SettingsMenu" method="close"]
 [connection signal="option_3_selected" from="." to="." method="open_settings"]
-
-[editable path="SettingsMenu"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Video/Language"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode2"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode3"]

Scenes/Prefabs/UI/BooRacePauseMenu.tscn

@@ -38,9 +38,3 @@ script = SubResource("GDScript_3lwy2")
 [connection signal="option_2_selected" from="." to="Handler" method="restart_race"]
 [connection signal="option_4_selected" from="." to="." method="close"]
 [connection signal="option_4_selected" from="." to="Handler" method="quit_to_menu"]
-
-[editable path="SettingsMenu"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Video/Language"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode2"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode3"]

Scenes/Prefabs/UI/MarathonPause.tscn

@@ -45,9 +45,3 @@ script = SubResource("GDScript_k4rkm")
 [connection signal="option_2_selected" from="." to="Handler" method="restart_run"]
 [connection signal="option_4_selected" from="." to="." method="close"]
 [connection signal="option_4_selected" from="." to="Handler" method="quit_to_menu"]
-
-[editable path="SettingsMenu"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Video/Language"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode2"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode3"]

Scenes/Prefabs/UI/MarathonPracticePause.tscn

@@ -47,9 +47,3 @@ script = SubResource("GDScript_k4rkm")
 
 [connection signal="option_2_selected" from="." to="Handler" method="restart_run"]
 [connection signal="option_3_selected" from="." to="Handler" method="quit_to_menu"]
-
-[editable path="SettingsMenu"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Video/Language"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode2"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode3"]

Scenes/Prefabs/UI/SettingsMenu.tscn

@@ -714,6 +714,7 @@ uppercase = true
 script = ExtResource("10_2qqpf")
 
 [node name="KeyboardControls" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer" node_paths=PackedStringArray("options")]
+visible = false
 layout_mode = 2
 size_flags_vertical = 3
 theme_override_constants/separation = -4

Scenes/Prefabs/UI/StoryPause.tscn

@@ -45,15 +45,6 @@ texture = SubResource("AtlasTexture_eud56")
 [node name="Handler" type="Node" parent="." index="2"]
 script = SubResource("GDScript_r6hlk")
 
-[node name="LabelFontChanger" parent="SettingsMenu" index="1" node_paths=PackedStringArray("labels")]
-labels = [NodePath("../PanelContainer/MarginContainer/VBoxContainer/Title"), NodePath("../PanelContainer/MarginContainer/VBoxContainer/CategorySelect/HBoxContainer/Category"), null, null, null, null, null, null, null, NodePath("../PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode/Value"), null, NodePath("../PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode2/Value"), null, NodePath("../PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode3/Value"), NodePath("../PanelContainer/MarginContainer/VBoxContainer/Difficulty/Description/AutoScrollContainer/MarginContainer/Desc")]
-
 [connection signal="option_1_selected" from="." to="." method="close"]
 [connection signal="option_2_selected" from="." to="Handler" method="restart_level"]
 [connection signal="option_4_selected" from="." to="Handler" method="quit_to_menu"]
-
-[editable path="SettingsMenu"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Video/Language"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode2"]
-[editable path="SettingsMenu/PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode3"]