mirror of
https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git
synced 2025-10-27 09:50:50 +00:00
Merge branch 'main' into custom-level-loading-rewrite
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=16 format=4 uid="uid://bgi3saqcxur3u"]
|
||||
[gd_scene load_steps=18 format=4 uid="uid://bgi3saqcxur3u"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://bcqr1v25ygedb" path="res://Scripts/Classes/LevelClass.gd" id="1_lqo4n"]
|
||||
[ext_resource type="JSON" path="res://Assets/Audio/BGM/Underwater.json" id="2_5ws2p"]
|
||||
@@ -15,6 +15,8 @@
|
||||
[ext_resource type="PackedScene" uid="uid://bksxgpygrdjl7" path="res://Scenes/Prefabs/LevelBG.tscn" id="15_6tii1"]
|
||||
[ext_resource type="PackedScene" uid="uid://iq86u4w60yee" path="res://Scenes/Prefabs/Entities/Objects/Firebar.tscn" id="16_6tii1"]
|
||||
[ext_resource type="Script" uid="uid://cybpwmw4ywoow" path="res://Scripts/Parts/TileMapConverter.gd" id="16_g83sl"]
|
||||
[ext_resource type="PackedScene" uid="uid://d3ptkkqrbxti7" path="res://Scenes/Prefabs/LevelObjects/CheepCheepSideGenerator.tscn" id="16_yldql"]
|
||||
[ext_resource type="PackedScene" uid="uid://bdirphnfabey8" path="res://Scenes/Prefabs/Entities/Enemies/GreenCheepCheep.tscn" id="17_eod1w"]
|
||||
|
||||
[node name="B-2" type="Node"]
|
||||
script = ExtResource("1_lqo4n")
|
||||
@@ -128,64 +130,73 @@ position = Vector2(2168.89, -88.0218)
|
||||
length = 16
|
||||
direction = 1
|
||||
|
||||
[node name="EntityGenerator" parent="." instance=ExtResource("16_yldql")]
|
||||
position = Vector2(8, -176)
|
||||
|
||||
[node name="EntityGenerator2" parent="." instance=ExtResource("16_yldql")]
|
||||
position = Vector2(8, -160)
|
||||
threshold = 3.0
|
||||
y_pos = 0
|
||||
entity_scene = ExtResource("17_eod1w")
|
||||
|
||||
[connection signal="collected" from="Tiles/Coin" to="Tiles/Coin/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67832" to="Tiles/@Node2D@67832/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67833" to="Tiles/@Node2D@67833/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67834" to="Tiles/@Node2D@67834/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67835" to="Tiles/@Node2D@67835/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67836" to="Tiles/@Node2D@67836/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67837" to="Tiles/@Node2D@67837/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67838" to="Tiles/@Node2D@67838/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67839" to="Tiles/@Node2D@67839/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67840" to="Tiles/@Node2D@67840/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67841" to="Tiles/@Node2D@67841/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67842" to="Tiles/@Node2D@67842/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67843" to="Tiles/@Node2D@67843/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67844" to="Tiles/@Node2D@67844/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67845" to="Tiles/@Node2D@67845/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67846" to="Tiles/@Node2D@67846/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67847" to="Tiles/@Node2D@67847/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67848" to="Tiles/@Node2D@67848/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67849" to="Tiles/@Node2D@67849/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67850" to="Tiles/@Node2D@67850/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67851" to="Tiles/@Node2D@67851/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67852" to="Tiles/@Node2D@67852/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67853" to="Tiles/@Node2D@67853/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67854" to="Tiles/@Node2D@67854/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67855" to="Tiles/@Node2D@67855/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67856" to="Tiles/@Node2D@67856/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67857" to="Tiles/@Node2D@67857/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67858" to="Tiles/@Node2D@67858/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67859" to="Tiles/@Node2D@67859/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67860" to="Tiles/@Node2D@67860/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67861" to="Tiles/@Node2D@67861/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67862" to="Tiles/@Node2D@67862/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67863" to="Tiles/@Node2D@67863/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67864" to="Tiles/@Node2D@67864/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67865" to="Tiles/@Node2D@67865/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67866" to="Tiles/@Node2D@67866/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67867" to="Tiles/@Node2D@67867/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67868" to="Tiles/@Node2D@67868/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67869" to="Tiles/@Node2D@67869/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67870" to="Tiles/@Node2D@67870/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67871" to="Tiles/@Node2D@67871/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67872" to="Tiles/@Node2D@67872/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67873" to="Tiles/@Node2D@67873/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67874" to="Tiles/@Node2D@67874/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67875" to="Tiles/@Node2D@67875/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67876" to="Tiles/@Node2D@67876/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67877" to="Tiles/@Node2D@67877/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67878" to="Tiles/@Node2D@67878/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67879" to="Tiles/@Node2D@67879/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67880" to="Tiles/@Node2D@67880/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67881" to="Tiles/@Node2D@67881/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67882" to="Tiles/@Node2D@67882/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67883" to="Tiles/@Node2D@67883/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67884" to="Tiles/@Node2D@67884/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67885" to="Tiles/@Node2D@67885/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67886" to="Tiles/@Node2D@67886/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67887" to="Tiles/@Node2D@67887/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67888" to="Tiles/@Node2D@67888/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67889" to="Tiles/@Node2D@67889/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67890" to="Tiles/@Node2D@67890/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@67891" to="Tiles/@Node2D@67891/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32531" to="Tiles/@Node2D@32531/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32532" to="Tiles/@Node2D@32532/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32533" to="Tiles/@Node2D@32533/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32534" to="Tiles/@Node2D@32534/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32535" to="Tiles/@Node2D@32535/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32536" to="Tiles/@Node2D@32536/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32537" to="Tiles/@Node2D@32537/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32538" to="Tiles/@Node2D@32538/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32539" to="Tiles/@Node2D@32539/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32540" to="Tiles/@Node2D@32540/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32541" to="Tiles/@Node2D@32541/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32542" to="Tiles/@Node2D@32542/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32543" to="Tiles/@Node2D@32543/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32544" to="Tiles/@Node2D@32544/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32545" to="Tiles/@Node2D@32545/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32546" to="Tiles/@Node2D@32546/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32547" to="Tiles/@Node2D@32547/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32548" to="Tiles/@Node2D@32548/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32549" to="Tiles/@Node2D@32549/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32550" to="Tiles/@Node2D@32550/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32551" to="Tiles/@Node2D@32551/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32552" to="Tiles/@Node2D@32552/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32553" to="Tiles/@Node2D@32553/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32554" to="Tiles/@Node2D@32554/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32555" to="Tiles/@Node2D@32555/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32556" to="Tiles/@Node2D@32556/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32557" to="Tiles/@Node2D@32557/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32558" to="Tiles/@Node2D@32558/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32559" to="Tiles/@Node2D@32559/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32560" to="Tiles/@Node2D@32560/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32561" to="Tiles/@Node2D@32561/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32562" to="Tiles/@Node2D@32562/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32563" to="Tiles/@Node2D@32563/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32564" to="Tiles/@Node2D@32564/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32565" to="Tiles/@Node2D@32565/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32566" to="Tiles/@Node2D@32566/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32567" to="Tiles/@Node2D@32567/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32568" to="Tiles/@Node2D@32568/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32569" to="Tiles/@Node2D@32569/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32570" to="Tiles/@Node2D@32570/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32571" to="Tiles/@Node2D@32571/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32572" to="Tiles/@Node2D@32572/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32573" to="Tiles/@Node2D@32573/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32574" to="Tiles/@Node2D@32574/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32575" to="Tiles/@Node2D@32575/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32576" to="Tiles/@Node2D@32576/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32577" to="Tiles/@Node2D@32577/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32578" to="Tiles/@Node2D@32578/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32579" to="Tiles/@Node2D@32579/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32580" to="Tiles/@Node2D@32580/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32581" to="Tiles/@Node2D@32581/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32582" to="Tiles/@Node2D@32582/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32583" to="Tiles/@Node2D@32583/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32584" to="Tiles/@Node2D@32584/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32585" to="Tiles/@Node2D@32585/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32586" to="Tiles/@Node2D@32586/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32587" to="Tiles/@Node2D@32587/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32588" to="Tiles/@Node2D@32588/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32589" to="Tiles/@Node2D@32589/LevelPersistance" method="set_as_active"]
|
||||
[connection signal="collected" from="Tiles/@Node2D@32590" to="Tiles/@Node2D@32590/LevelPersistance" method="set_as_active"]
|
||||
|
||||
Reference in New Issue
Block a user