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

Scenes/Prefabs/Entities/Enemies/Barrel.tscn

@@ -93,6 +93,7 @@ metadata/_custom_type_script = "uid://dlq6o2rg1x7in"
 
 [node name="ScoreNoteSpawner" type="Node" parent="."]
 script = ExtResource("8_m378g")
+add_score = true
 metadata/_custom_type_script = "uid://5octqlf4ohel"
 
 [node name="ExplosionDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]

Scenes/Prefabs/Entities/Enemies/Bowser.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=41 format=3 uid="uid://duptcik2j0b04"]
+[gd_scene load_steps=40 format=3 uid="uid://duptcik2j0b04"]
 
 [ext_resource type="Texture2D" uid="uid://d3sxabber73q6" path="res://Assets/Sprites/Enemies/Bowser.png" id="1_8mi7o"]
 [ext_resource type="Script" uid="uid://wtypg4d0l6j2" path="res://Scripts/Classes/Entities/Enemies/Bowser.gd" id="1_ma5fd"]
@@ -11,7 +11,6 @@
 [ext_resource type="JSON" path="res://Assets/Sprites/Enemies/Bowser.json" id="6_nf6hu"]
 [ext_resource type="Script" uid="uid://cmvlgsjmsk0v5" path="res://Scripts/Classes/Resources/ThemedResource.gd" id="6_pvhfi"]
 [ext_resource type="Script" uid="uid://c3gg32ivrlq8n" path="res://Scripts/Classes/Components/GibSpawner.gd" id="6_va0n6"]
-[ext_resource type="JSON" path="res://Assets/Sprites/Enemies/Goomba.json" id="9_exf4b"]
 [ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="11_pvhfi"]
 [ext_resource type="Script" uid="uid://cqif1li7otvpl" path="res://Scripts/Parts/SpriteFramesToJsonConverter.gd" id="14_nf6hu"]
 [ext_resource type="Script" uid="uid://ctfbuoxtnnl0q" path="res://Scripts/Classes/Components/EditorPropertyExposer.gd" id="15_nf6hu"]
@@ -300,7 +299,7 @@ metadata/_custom_type_script = "uid://caq1qiwmy0mox"
 script = ExtResource("5_17x2r")
 node_to_affect = NodePath("..")
 property_name = "sprite_frames"
-resource_json = ExtResource("9_exf4b")
+resource_json = ExtResource("6_nf6hu")
 use_cache = false
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
@@ -344,6 +343,7 @@ metadata/_custom_type_script = "uid://dri2d5jtu0fbq"
 [node name="GibSpawner" type="Node" parent="." node_paths=PackedStringArray("visuals")]
 script = ExtResource("6_va0n6")
 visuals = NodePath("../SpriteScaleJoint/DeathSprite")
+gib_type = 1
 metadata/_custom_type_script = "uid://c3gg32ivrlq8n"
 
 [node name="ScoreNoteSpawner" type="Node" parent="."]
@@ -403,13 +403,14 @@ 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="." method="show_smoke" unbinds=1]
 [connection signal="killed" from="." to="ScoreNoteSpawner" method="spawn_note" binds= [5000]]
+[connection signal="killed" from="." to="." method="show_smoke" unbinds=1]
 [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"]
 [connection signal="timeout" from="FlameTimer" to="." method="breathe_fire"]
 [connection signal="fireball_hit" from="FireballDetection" to="." method="fireball_hit" unbinds=1]
+[connection signal="gib_about_to_spawn" from="GibSpawner" to="." method="on_gib_about_to_spawn"]
 [connection signal="screen_entered" from="VisibleOnScreenEnabler2D" to="." method="play_music" flags=6]
 [connection signal="attached" from="TrackJoint" to="MoveAnimation" method="play" binds= ["RESET"]]
 [connection signal="moving_shell_entered" from="ShellDetection" to="ShellDetection" method="destroy_shell"]

Scenes/Prefabs/Entities/Enemies/BowsersBro.tscn

@@ -11,3 +11,6 @@ resource_json = ExtResource("2_qcxx5")
 
 [node name="ResourceSetterNew" parent="SpriteScaleJoint/DeathSprite" index="0"]
 resource_json = ExtResource("2_qcxx5")
+
+[node name="GibSpawner" parent="." index="8" node_paths=PackedStringArray("visuals")]
+visuals = NodePath("../SpriteScaleJoint/DeathSprite")

Scenes/Prefabs/Entities/Enemies/DryBones.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=25 format=3 uid="uid://bxsay5e6dhcqb"]
+[gd_scene load_steps=26 format=3 uid="uid://bxsay5e6dhcqb"]
 
 [ext_resource type="Script" uid="uid://n123x5yuqpjd" path="res://Scripts/Classes/Entities/Enemies/DryBones.gd" id="1_8c647"]
 [ext_resource type="Texture2D" uid="uid://c5snfukhcacyf" path="res://Assets/Sprites/Enemies/DryBones.png" id="2_qya46"]
@@ -11,6 +11,7 @@
 [ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="7_qya46"]
 [ext_resource type="Script" uid="uid://dlq6o2rg1x7in" path="res://Scripts/Classes/Components/BasicEnemyMovement.gd" id="10_br3pe"]
 [ext_resource type="Script" uid="uid://ba18grqjixded" path="res://Scripts/Classes/Components/ExplosionDetection.gd" id="11_l4h6l"]
+[ext_resource type="Script" uid="uid://blfnd65xcx78c" path="res://Scripts/Classes/Components/LedgeDetectionCast.gd" id="12_w4qtl"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_w4qtl"]
 atlas = ExtResource("2_qya46")
@@ -196,14 +197,22 @@ rect = Rect2(-10, -13, 20, 23)
 script = ExtResource("7_qya46")
 metadata/_custom_type_script = "uid://5octqlf4ohel"
 
-[node name="BasicEnemyMovement" type="Node" parent="."]
+[node name="BasicEnemyMovement" type="Node" parent="." node_paths=PackedStringArray("ledge_detection_cast")]
 script = ExtResource("10_br3pe")
+ledge_detection_cast = NodePath("../LedgeDetectionCast")
 
 [node name="ExplosionDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
 script = ExtResource("11_l4h6l")
 hitbox = NodePath("../Hitbox")
 metadata/_custom_type_script = "uid://ba18grqjixded"
 
+[node name="LedgeDetectionCast" type="RayCast2D" parent="."]
+position = Vector2(-2, -2)
+target_position = Vector2(0, 3)
+collision_mask = 2
+script = ExtResource("12_w4qtl")
+metadata/_custom_type_script = "uid://blfnd65xcx78c"
+
 [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]]

Scenes/Prefabs/Entities/Enemies/HammerBro.tscn

@@ -69,14 +69,14 @@ loop_mode = 2
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
-tracks/0/path = NodePath("Sprite:position")
+tracks/0/path = NodePath("MovementJoint:position")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
 "times": PackedFloat32Array(0, 1),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
-"values": [Vector2(8, -12), Vector2(-8, -12)]
+"values": [Vector2(8, 0), Vector2(-8, 0)]
 }
 
 [sub_resource type="Animation" id="Animation_scjjh"]
@@ -84,14 +84,14 @@ length = 0.001
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
-tracks/0/path = NodePath("Sprite:position")
+tracks/0/path = NodePath("MovementJoint:position")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
 "times": PackedFloat32Array(0),
 "transitions": PackedFloat32Array(1),
 "update": 0,
-"values": [Vector2(0, -12)]
+"values": [Vector2(0, 0)]
 }
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_2vqj5"]
@@ -187,25 +187,28 @@ on_screen_enabler = NodePath("VisibleOnScreenEnabler2D")
 score_note_adder = NodePath("ScoreNoteSpawner")
 metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
 
-[node name="Sprite" type="AnimatedSprite2D" parent="."]
+[node name="MovementJoint" type="Node2D" parent="."]
+
+[node name="Sprite" type="AnimatedSprite2D" parent="MovementJoint"]
 position = Vector2(0, -12)
-scale = Vector2(-1, 1)
+rotation = 3.1415927
+scale = Vector2(1, -1)
 sprite_frames = SubResource("SpriteFrames_cl1av")
 animation = &"Idle"
 frame_progress = 0.755197
-offset = Vector2(2, 0)
+offset = Vector2(2, 1)
 flip_h = true
 script = ExtResource("3_hx42c")
 metadata/_custom_type_script = "uid://caq1qiwmy0mox"
 
-[node name="Hammer" type="Sprite2D" parent="Sprite"]
+[node name="Hammer" type="Sprite2D" parent="MovementJoint/Sprite"]
 visible = false
 show_behind_parent = true
 position = Vector2(0, -17)
 texture = SubResource("AtlasTexture_hx42c")
 flip_h = true
 
-[node name="ResourceSetterNew" type="Node" parent="Sprite/Hammer" node_paths=PackedStringArray("node_to_affect")]
+[node name="ResourceSetterNew" type="Node" parent="MovementJoint/Sprite/Hammer" node_paths=PackedStringArray("node_to_affect")]
 script = ExtResource("7_pvn5i")
 node_to_affect = NodePath("..")
 property_name = "texture"
@@ -213,7 +216,7 @@ mode = 1
 resource_json = ExtResource("6_0w8yj")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
-[node name="ResourceSetterNew" type="Node" parent="Sprite" node_paths=PackedStringArray("node_to_affect")]
+[node name="ResourceSetterNew" type="Node" parent="MovementJoint/Sprite" node_paths=PackedStringArray("node_to_affect")]
 script = ExtResource("7_pvn5i")
 node_to_affect = NodePath("..")
 property_name = "sprite_frames"
@@ -274,7 +277,7 @@ metadata/_custom_type_script = "uid://dri2d5jtu0fbq"
 
 [node name="GibSpawner" type="Node" parent="." node_paths=PackedStringArray("visuals")]
 script = ExtResource("8_1mp8k")
-visuals = NodePath("../Sprite")
+visuals = NodePath("../MovementJoint/Sprite")
 metadata/_custom_type_script = "uid://c3gg32ivrlq8n"
 
 [node name="VisibleOnScreenEnabler2D" type="VisibleOnScreenEnabler2D" parent="."]
@@ -324,7 +327,7 @@ metadata/_custom_type_script = "uid://d4a7yp6e55u8t"
 [connection signal="block_bounced" from="BlockBouncingDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [1000]]
 [connection signal="fireball_hit" from="FireballDetection" to="." method="die_from_object"]
 [connection signal="fireball_hit" from="FireballDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [1000]]
-[connection signal="gib_about_to_spawn" from="GibSpawner" to="Sprite/Hammer" method="hide"]
+[connection signal="gib_about_to_spawn" from="GibSpawner" to="MovementJoint/Sprite/Hammer" method="hide"]
 [connection signal="screen_entered" from="VisibleOnScreenEnabler2D" to="." method="on_screen_entered"]
 [connection signal="timeout" from="Timer" to="." method="charge"]
 [connection signal="moving_shell_entered" from="ShellDetection" to="." method="die_from_object"]

Scenes/Prefabs/Entities/Enemies/Pokey.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=22 format=3 uid="uid://beggmeixrin75"]
+[gd_scene load_steps=23 format=3 uid="uid://beggmeixrin75"]
 
 [ext_resource type="Script" uid="uid://b1b6aiai213ci" path="res://Scripts/Classes/Entities/Enemies/Pokey.gd" id="1_b54ls"]
 [ext_resource type="Texture2D" uid="uid://dj46y8vhqlqjw" path="res://Assets/Sprites/Enemies/Pokey.png" id="2_8aome"]
@@ -15,6 +15,7 @@
 [ext_resource type="Script" uid="uid://dlq6o2rg1x7in" path="res://Scripts/Classes/Components/BasicEnemyMovement.gd" id="11_8aome"]
 [ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="12_b54ls"]
 [ext_resource type="Script" uid="uid://ctfbuoxtnnl0q" path="res://Scripts/Classes/Components/EditorPropertyExposer.gd" id="13_30hxr"]
+[ext_resource type="Script" uid="uid://blfnd65xcx78c" path="res://Scripts/Classes/Components/LedgeDetectionCast.gd" id="16_rjgwh"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_g6vo0"]
 atlas = ExtResource("2_8aome")
@@ -357,8 +358,11 @@ shape = SubResource("RectangleShape2D_mpg4k")
 position = Vector2(0, -168)
 rect = Rect2(-10, 0, 20, 176)
 
-[node name="BasicEnemyMovement" type="Node" parent="." node_paths=PackedStringArray("visuals")]
+[node name="BasicEnemyMovement" type="Node" parent="." node_paths=PackedStringArray("ledge_detection_cast", "visuals")]
 script = ExtResource("11_8aome")
+ledge_detection_cast = NodePath("../LedgeDetectionCast")
+move_speed = 16
+second_quest_speed = 20
 visuals = NodePath("../Parts")
 metadata/_custom_type_script = "uid://dlq6o2rg1x7in"
 
@@ -375,6 +379,12 @@ properties = Array[String](["length"])
 process_mode = 3
 script = SubResource("GDScript_30hxr")
 
+[node name="LedgeDetectionCast" type="RayCast2D" parent="."]
+position = Vector2(-4, -5)
+target_position = Vector2(0, 8)
+collision_mask = 2
+script = ExtResource("16_rjgwh")
+
 [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"]

Scenes/Prefabs/Entities/Enemies/Thwomp.tscn

@@ -141,11 +141,14 @@ metadata/_custom_type_script = "uid://d4a7yp6e55u8t"
 
 [node name="ScoreNoteSpawner" type="Node" parent="."]
 script = ExtResource("11_jkv5r")
+add_score = true
 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="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="damage_player"]
 [connection signal="block_bounced" from="BlockBouncingDetection" to="." method="die_from_object"]

Scenes/Prefabs/Entities/Enemies/TrueBowser.tscn

@@ -5,7 +5,7 @@
 
 [node name="TrueBowser" instance=ExtResource("1_xtf8a")]
 can_hammer = true
-metadata/is_real = true
+is_real = true
 
 [node name="ResourceSetterNew" parent="SpriteScaleJoint/DeathSprite" index="0"]
 resource_json = ExtResource("4_ryqkh")

Scenes/Prefabs/Entities/Items/RedCoin.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=17 format=3 uid="uid://cmbpqnq10arts"]
+[gd_scene load_steps=19 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"]
@@ -6,6 +6,7 @@
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_0xloa"]
 [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"]
+[ext_resource type="Script" uid="uid://maqpreddu5kg" path="res://Scripts/Classes/Components/LevelPersistance.gd" id="7_0r8d3"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_lwdcj"]
 atlas = ExtResource("2_lwdcj")
@@ -79,6 +80,9 @@ animations = [{
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_4qu2r"]
 size = Vector2(12, 15)
 
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_0xloa"]
+size = Vector2(8, 8)
+
 [node name="RedCoin" type="Node2D"]
 visibility_layer = 3
 z_index = -2
@@ -107,10 +111,24 @@ collision_mask = 5
 position = Vector2(0, 1.5)
 shape = SubResource("RectangleShape2D_4qu2r")
 
-[node name="BlockBouncingDetection" type="Node" parent="."]
+[node name="BlockBouncingDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
 script = ExtResource("4_lwdcj")
 detection_type = 1
+hitbox = NodePath("../BlockHitbox")
 metadata/_custom_type_script = "uid://cmg61722ktg2m"
 
+[node name="BlockHitbox" type="Area2D" parent="."]
+collision_layer = 0
+collision_mask = 6
+
+[node name="Shape" type="CollisionShape2D" parent="BlockHitbox"]
+position = Vector2(0, 12)
+shape = SubResource("RectangleShape2D_0xloa")
+
+[node name="LevelPersistance" type="Node" parent="."]
+script = ExtResource("7_0r8d3")
+
+[connection signal="collected" from="." to="LevelPersistance" method="set_as_active"]
 [connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
 [connection signal="block_bounced" from="BlockBouncingDetection" to="." method="summon_bounced_coin" unbinds=1]
+[connection signal="enabled" from="LevelPersistance" to="." method="queue_free"]

Scenes/Prefabs/Entities/Objects/TrackPiece.tscn

@@ -43,6 +43,7 @@ region_rect = Rect2(0, 16, 32, 16)
 shape = SubResource("RectangleShape2D_4k6gi")
 
 [node name="PlacePreview" type="Node2D" parent="."]
+visible = false
 z_index = 1
 
 [node name="NW" type="Sprite2D" parent="PlacePreview"]

Scenes/Prefabs/LevelObjects/CheepCheepSideGenerator.tscn

@@ -0,0 +1,24 @@
+[gd_scene load_steps=6 format=3 uid="uid://d3ptkkqrbxti7"]
+
+[ext_resource type="PackedScene" uid="uid://bn1kect7h2dlp" path="res://Scenes/Prefabs/LevelObjects/BulletBillGenerator.tscn" id="1_tqe64"]
+[ext_resource type="PackedScene" uid="uid://d04e1qv3si8j" path="res://Scenes/Prefabs/Entities/Enemies/RedCheepCheep.tscn" id="2_thtyo"]
+[ext_resource type="Texture2D" uid="uid://cd8q0nuveukv1" path="res://Assets/Sprites/Editor/CheepCheepSideGenerator.png" id="3_nd37u"]
+[ext_resource type="Script" uid="uid://bq0pc2vhp35t2" path="res://Scripts/Parts/EntityGenerator.gd" id="4_nd37u"]
+[ext_resource type="PackedScene" uid="uid://bdirphnfabey8" path="res://Scenes/Prefabs/Entities/Enemies/GreenCheepCheep.tscn" id="5_d47d1"]
+
+[node name="EntityGenerator" instance=ExtResource("1_tqe64")]
+threshold = 4.0
+y_pos = 1
+entity_scene = ExtResource("2_thtyo")
+
+[node name="Sprite" parent="LevelEditorVisibleNode" index="0"]
+texture = ExtResource("3_nd37u")
+
+[node name="EntityGenerator" type="Node2D" parent="." index="2"]
+script = ExtResource("4_nd37u")
+threshold = 3.0
+y_pos = 1
+entity_scene = ExtResource("5_d47d1")
+metadata/_custom_type_script = "uid://bq0pc2vhp35t2"
+
+[connection signal="activated" from="." to="EntityGenerator" method="activate"]

Scenes/Prefabs/LevelObjects/EndFlagpole.tscn

@@ -1,8 +1,7 @@
-[gd_scene load_steps=24 format=3 uid="uid://c6loucilra6da"]
+[gd_scene load_steps=22 format=3 uid="uid://c6loucilra6da"]
 
 [ext_resource type="Script" uid="uid://dwfnvpioh2kvi" path="res://Scripts/Parts/EndFlagpole.gd" id="1_3rtm4"]
 [ext_resource type="Texture2D" uid="uid://3vg41a5plc4e" path="res://Assets/Sprites/Tilesets/FlagPole.png" id="1_hnd65"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="4_62gix"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Tilesets/FlagPole.json" id="4_nykv5"]
 [ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="5_dm4yn"]
 [ext_resource type="Script" uid="uid://cmvlgsjmsk0v5" path="res://Scripts/Classes/Resources/ThemedResource.gd" id="5_jihtx"]
@@ -57,9 +56,6 @@ _data = {
 &"RESET": SubResource("Animation_xwflf")
 }
 
-[sub_resource type="CircleShape2D" id="CircleShape2D_c56yc"]
-radius = 4.0
-
 [sub_resource type="Animation" id="Animation_uwkl1"]
 length = 0.001
 tracks/0/type = "value"
@@ -170,14 +166,6 @@ libraries = {
 &"": SubResource("AnimationLibrary_62gix")
 }
 
-[node name="Top" type="Area2D" parent="."]
-script = ExtResource("4_62gix")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Top"]
-position = Vector2(0, -164)
-shape = SubResource("CircleShape2D_c56yc")
-
 [node name="ScoreNoteSpawner" type="Node" parent="."]
 script = ExtResource("5_dm4yn")
 note_offset = Vector2(0, -160)
@@ -211,5 +199,3 @@ json_file_path = "res://Assets/Sprites/Tilesets/FlagPole.json"
 metadata/_custom_type_script = "uid://cqif1li7otvpl"
 
 [connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
-[connection signal="player_entered" from="Top" to="." method="on_player_entered"]
-[connection signal="player_entered" from="Top" to="ScoreNoteSpawner" method="spawn_one_up_note" unbinds=1]

Scenes/Prefabs/Particles/LakituCloudBurst.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=10 format=3 uid="uid://dybfmrawthall"]
+[gd_scene load_steps=9 format=3 uid="uid://dybfmrawthall"]
 
 [ext_resource type="Texture2D" uid="uid://boongcly3e2cl" path="res://Assets/Sprites/Particles/LakituCloudBurst.png" id="1_3jvpp"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="2_cic8a"]
@@ -40,20 +40,12 @@ animations = [{
 "speed": 10.0
 }]
 
-[sub_resource type="GDScript" id="GDScript_3jvpp"]
-script/source = "extends AnimatedSprite2D
-
-func _ready() -> void:
-	pass
-"
-
 [node name="LakituCloudBurst" type="AnimatedSprite2D"]
 z_index = 5
 sprite_frames = SubResource("SpriteFrames_xs1ui")
 autoplay = "default"
 frame = 3
 frame_progress = 1.0
-script = SubResource("GDScript_3jvpp")
 
 [node name="Timer" type="Timer" parent="."]
 wait_time = 10.0

Scenes/Prefabs/UI/SettingsMenu.tscn

@@ -562,6 +562,7 @@ title = "RESOURCE_REFRESH"
 [node name="SelectableOptionNode3" parent="PanelContainer/MarginContainer/VBoxContainer/ResourcePacks" instance=ExtResource("9_t6b48")]
 layout_mode = 2
 title = "RESOURCE_PACK_CREATE"
+press_sfx = ""
 
 [node name="ResourcePackLoader" type="Node" parent="PanelContainer/MarginContainer/VBoxContainer/ResourcePacks"]
 script = ExtResource("9_2qqpf")
@@ -639,7 +640,7 @@ settings_category = "difficulty"
 
 [node name="GameOverStyle" parent="PanelContainer/MarginContainer/VBoxContainer/Difficulty" groups=["Options"] instance=ExtResource("3_dl6kk")]
 layout_mode = 2
-option_key = "game_over"
+option_key = "game_over_behaviour"
 title = "DIFFI_GAME_OVER"
 value_descs = Array[String](["DESC_GAME_OVER_0", "DESC_GAME_OVER_1", "DESC_GAME_OVER_2"])
 values = ["DIFFI_GAME_OVER_WLD", "DIFFI_GAME_OVER_LVL", "DIFFI_GAME_OVER_GME"]
@@ -1019,6 +1020,7 @@ script = ExtResource("19_k6yev")
 [connection signal="button_pressed" from="PanelContainer/MarginContainer/VBoxContainer/ResourcePacks/SelectableOptionNode" to="PanelContainer/MarginContainer/VBoxContainer/ResourcePacks/ResourcePackLoader" method="open_folder"]
 [connection signal="button_pressed" from="PanelContainer/MarginContainer/VBoxContainer/ResourcePacks/SelectableOptionNode2" to="PanelContainer/MarginContainer/VBoxContainer/ResourcePacks/ResourcePackLoader" method="get_resource_packs"]
 [connection signal="button_pressed" from="PanelContainer/MarginContainer/VBoxContainer/ResourcePacks/SelectableOptionNode3" to="ResourcePackTemplateCreator" method="create_template"]
+[connection signal="button_pressed" from="PanelContainer/MarginContainer/VBoxContainer/ResourcePacks/SelectableOptionNode3" to="PanelContainer/MarginContainer/VBoxContainer/ResourcePacks/SelectableOptionNode3" method="set_title" binds= ["Creating Resource Pack..."]]
 [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Difficulty/DamageStyle" to="PanelContainer/MarginContainer/VBoxContainer/Difficulty/DifficultySetter" method="damage_style_changed"]
 [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Difficulty/Checkpoints" to="PanelContainer/MarginContainer/VBoxContainer/Difficulty/DifficultySetter" method="checkpoint_changed"]
 [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Difficulty/ExtraCheckpoints" to="PanelContainer/MarginContainer/VBoxContainer/Difficulty/DifficultySetter" method="extra_checkpoints_changed"]
@@ -1036,6 +1038,8 @@ script = ExtResource("19_k6yev")
 [connection signal="deleted" from="PanelContainer/MarginContainer/VBoxContainer/Data/AchievementData" to="PanelContainer/MarginContainer/VBoxContainer/Data/DataDeletion" method="delete_achievement"]
 [connection signal="deleted" from="PanelContainer/MarginContainer/VBoxContainer/Data/Everything" to="PanelContainer/MarginContainer/VBoxContainer/Data/DataDeletion" method="delete_everything"]
 [connection signal="button_pressed" from="PanelContainer/MarginContainer/VBoxContainer/Data/RegenROM" to="PanelContainer/MarginContainer/VBoxContainer/Data/DataDeletion" method="regen_rom"]
+[connection signal="pack_created" from="ResourcePackTemplateCreator" to="PanelContainer/MarginContainer/VBoxContainer/ResourcePacks/SelectableOptionNode3" method="set_title" binds= ["RESOURCE_PACK_CREATE"]]
+[connection signal="pack_created" from="ResourcePackTemplateCreator" to="PanelContainer/MarginContainer/VBoxContainer/ResourcePacks/SelectableOptionNode3" method="play_sfx" binds= ["correct"]]
 
 [editable path="PanelContainer/MarginContainer/VBoxContainer/Video/Language"]
 [editable path="PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode"]