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

This commit is contained in:
JHDev2006
2025-10-26 12:33:16 +00:00
158 changed files with 2106 additions and 1148 deletions

View File

@@ -107,8 +107,9 @@ sprite_frames = SubResource("SpriteFrames_6dnyh")
script = ExtResource("17_xhct6")
metadata/_custom_type_script = "uid://caq1qiwmy0mox"
[node name="ResourceSetterNew" type="Node" parent="PeachNPC2"]
[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"
@@ -144,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@36878" to="Tiles/@Node2D@36878/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36879" to="Tiles/@Node2D@36879/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36880" to="Tiles/@Node2D@36880/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36881" to="Tiles/@Node2D@36881/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36882" to="Tiles/@Node2D@36882/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36883" to="Tiles/@Node2D@36883/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36884" to="Tiles/@Node2D@36884/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36885" to="Tiles/@Node2D@36885/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36886" to="Tiles/@Node2D@36886/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36887" to="Tiles/@Node2D@36887/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36888" to="Tiles/@Node2D@36888/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36889" to="Tiles/@Node2D@36889/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36890" to="Tiles/@Node2D@36890/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36891" to="Tiles/@Node2D@36891/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36892" to="Tiles/@Node2D@36892/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36893" to="Tiles/@Node2D@36893/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36894" to="Tiles/@Node2D@36894/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36895" to="Tiles/@Node2D@36895/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36896" to="Tiles/@Node2D@36896/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36897" to="Tiles/@Node2D@36897/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36898" to="Tiles/@Node2D@36898/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@36899" to="Tiles/@Node2D@36899/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48636" to="Tiles/@Node2D@48636/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48637" to="Tiles/@Node2D@48637/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48638" to="Tiles/@Node2D@48638/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48639" to="Tiles/@Node2D@48639/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48640" to="Tiles/@Node2D@48640/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48641" to="Tiles/@Node2D@48641/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48642" to="Tiles/@Node2D@48642/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48643" to="Tiles/@Node2D@48643/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48644" to="Tiles/@Node2D@48644/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48645" to="Tiles/@Node2D@48645/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48646" to="Tiles/@Node2D@48646/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48647" to="Tiles/@Node2D@48647/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48648" to="Tiles/@Node2D@48648/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48649" to="Tiles/@Node2D@48649/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48650" to="Tiles/@Node2D@48650/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48651" to="Tiles/@Node2D@48651/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48652" to="Tiles/@Node2D@48652/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48653" to="Tiles/@Node2D@48653/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48654" to="Tiles/@Node2D@48654/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48655" to="Tiles/@Node2D@48655/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48656" to="Tiles/@Node2D@48656/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@48657" to="Tiles/@Node2D@48657/LevelPersistance" method="set_as_active"]

View File

@@ -238,7 +238,7 @@ metadata/_custom_type_script = "uid://pfwgmuchergf"
[node name="ChallengeNodes" type="Node" parent="." node_paths=PackedStringArray("nodes_to_delete")]
script = ExtResource("27_nvjju")
nodes_to_delete = [NodePath("../Blocks/QuestionBlock2"), null, NodePath("../Blocks/BrickBlock7")]
nodes_to_delete = [NodePath("../Blocks/QuestionBlock2"), NodePath("../Blocks/BrickBlock7")]
metadata/_custom_type_script = "uid://cgm3opb5qudc1"
[node name="RedCoin" parent="ChallengeNodes" instance=ExtResource("28_t63mw")]

View File

@@ -164,9 +164,8 @@ position = Vector2(3192, 0)
[node name="Checkpoint" parent="." instance=ExtResource("20_xv2tb")]
position = Vector2(1328, 0)
[node name="ChallengeNodes" type="Node" parent="." node_paths=PackedStringArray("nodes_to_delete")]
[node name="ChallengeNodes" type="Node" parent="."]
script = ExtResource("21_8rqg6")
nodes_to_delete = [null]
metadata/_custom_type_script = "uid://cgm3opb5qudc1"
[node name="RedCoin" parent="ChallengeNodes" instance=ExtResource("22_cxldk")]

View File

@@ -112,7 +112,7 @@ tile_map_data = PackedByteArray("AAD7////AAAAAAAAAAD8////AAABAAAAAAD+////AAABAAA
[node name="ChallengeNodes" type="Node" parent="." node_paths=PackedStringArray("nodes_to_delete")]
script = ExtResource("21_f001g")
nodes_to_delete = [NodePath("../Blocks/QuestionBlock3"), NodePath("../Coin"), null, NodePath("../Blocks/QuestionBlock4")]
nodes_to_delete = [NodePath("../Blocks/QuestionBlock3"), NodePath("../Coin"), NodePath("../Blocks/QuestionBlock4")]
metadata/_custom_type_script = "uid://cgm3opb5qudc1"
[node name="QuestionBlock" parent="ChallengeNodes" instance=ExtResource("9_vtupl")]

View File

@@ -253,13 +253,8 @@ position = Vector2(2624, -32)
pipe_id = 3
exit_only = true
[node name="Checkpoint2" parent="." instance=ExtResource("10_q2h2g")]
position = Vector2(1296, 0)
optional = true
[node name="CheckpointFlag" parent="." instance=ExtResource("24_v8ufo")]
position = Vector2(1296, 0)
optional = true
[connection signal="block_destroyed" from="Tiles/BrickBlock" to="Tiles/BrickBlock/LevelPersistance" method="set_as_active_2"]
[connection signal="block_emptied" from="Tiles/BrickBlock" to="Tiles/BrickBlock/LevelPersistance" method="set_as_active"]

View File

@@ -185,7 +185,7 @@ optional = true
[node name="ChallengeNodes" type="Node" parent="." node_paths=PackedStringArray("nodes_to_delete")]
script = ExtResource("20_8cbri")
nodes_to_delete = [NodePath("../Enemies/Lakitu"), NodePath("../DecoTiles"), NodePath("../Blocks")]
nodes_to_delete = [NodePath("../Blocks")]
force_on = true
metadata/_custom_type_script = "uid://cgm3opb5qudc1"