mirror of
https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git
synced 2025-10-22 07:28:14 +00:00
fixed up some lost levels stuff
This commit is contained in:
@@ -177,9 +177,7 @@
|
|||||||
"SMBS": {
|
"SMBS": {
|
||||||
"source": "CastleWaterSP.png"
|
"source": "CastleWaterSP.png"
|
||||||
},
|
},
|
||||||
"SMBANN": {
|
"SMBANN": {"link": "SMBLL"}
|
||||||
"source": "CastleWaterANN.png"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"Airship": {
|
"Airship": {
|
||||||
"SMB1": {
|
"SMB1": {
|
||||||
@@ -198,4 +196,4 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -112,9 +112,6 @@ animations = [{
|
|||||||
[node name="LostLevelsEnding" instance=ExtResource("1_3ouhg")]
|
[node name="LostLevelsEnding" instance=ExtResource("1_3ouhg")]
|
||||||
campaign = "SMBANN"
|
campaign = "SMBANN"
|
||||||
|
|
||||||
[node name="DayBG" parent="." index="1"]
|
|
||||||
visible = false
|
|
||||||
|
|
||||||
[node name="Sprite2D2" parent="." index="8"]
|
[node name="Sprite2D2" parent="." index="8"]
|
||||||
texture = ExtResource("2_xj4cw")
|
texture = ExtResource("2_xj4cw")
|
||||||
region_rect = Rect2(128, 0, 16, 32)
|
region_rect = Rect2(128, 0, 16, 32)
|
||||||
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -435,6 +435,7 @@ centered = false
|
|||||||
color = Color(0, 0, 0, 0)
|
color = Color(0, 0, 0, 0)
|
||||||
|
|
||||||
[node name="Node2D" type="Node2D" parent="."]
|
[node name="Node2D" type="Node2D" parent="."]
|
||||||
|
position = Vector2(0, 1)
|
||||||
|
|
||||||
[node name="PlayerSprite" type="AnimatedSprite2D" parent="Node2D" node_paths=PackedStringArray("resource_setter")]
|
[node name="PlayerSprite" type="AnimatedSprite2D" parent="Node2D" node_paths=PackedStringArray("resource_setter")]
|
||||||
sprite_frames = ExtResource("4_fxsfu")
|
sprite_frames = ExtResource("4_fxsfu")
|
||||||
@@ -466,7 +467,7 @@ libraries = {
|
|||||||
autoplay = "Main"
|
autoplay = "Main"
|
||||||
|
|
||||||
[node name="Sprite2D2" type="Sprite2D" parent="."]
|
[node name="Sprite2D2" type="Sprite2D" parent="."]
|
||||||
position = Vector2(16, -16)
|
position = Vector2(16, -15)
|
||||||
texture = ExtResource("10_1flm1")
|
texture = ExtResource("10_1flm1")
|
||||||
region_rect = Rect2(0, 0, 16, 32)
|
region_rect = Rect2(0, 0, 16, 32)
|
||||||
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -164,13 +164,13 @@ position = Vector2(8, -56)
|
|||||||
[connection signal="player_block_hit" from="Tiles/QuestionBlock" to="Tiles/QuestionBlock/BlockAnimations" method="bounce_block" unbinds=1]
|
[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" method="dispense_item" unbinds=1]
|
||||||
[connection signal="shell_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/BlockAnimations" method="bounce_block" unbinds=1]
|
||||||
[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@120015" to="Tiles/@AnimatableBody2D@120015/LevelPersistance" method="set_as_active_2"]
|
[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@83243" to="Tiles/@AnimatableBody2D@83243/LevelPersistance" method="set_as_active_2"]
|
||||||
[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@120015" to="Tiles/@AnimatableBody2D@120015/LevelPersistance" method="set_as_active"]
|
[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@83243" to="Tiles/@AnimatableBody2D@83243/LevelPersistance" method="set_as_active"]
|
||||||
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@120015" to="Tiles/@AnimatableBody2D@120015" method="player_mushroom_check"]
|
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@83243" to="Tiles/@AnimatableBody2D@83243" method="player_mushroom_check"]
|
||||||
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@120015" to="Tiles/@AnimatableBody2D@120015" method="dispense_item" unbinds=1]
|
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@83243" to="Tiles/@AnimatableBody2D@83243" method="dispense_item" unbinds=1]
|
||||||
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@120015" to="Tiles/@AnimatableBody2D@120015/BlockAnimations" method="bounce_block" unbinds=1]
|
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@83243" to="Tiles/@AnimatableBody2D@83243/BlockAnimations" method="bounce_block" unbinds=1]
|
||||||
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@120015" to="Tiles/@AnimatableBody2D@120015" method="dispense_item" unbinds=1]
|
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@83243" to="Tiles/@AnimatableBody2D@83243" method="dispense_item" unbinds=1]
|
||||||
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@120015" to="Tiles/@AnimatableBody2D@120015/BlockAnimations" method="bounce_block" unbinds=1]
|
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@83243" to="Tiles/@AnimatableBody2D@83243/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_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="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"]
|
[connection signal="player_block_hit" from="Tiles/InvisibleQuestionBlock" to="Tiles/InvisibleQuestionBlock" method="player_mushroom_check"]
|
||||||
|
@@ -25,7 +25,9 @@ func _ready() -> void:
|
|||||||
func _process(_delta: float) -> void:
|
func _process(_delta: float) -> void:
|
||||||
if can_exit and Input.is_action_just_pressed("jump_0"):
|
if can_exit and Input.is_action_just_pressed("jump_0"):
|
||||||
SaveManager.write_save()
|
SaveManager.write_save()
|
||||||
if seen or Global.current_campaign == "SMBANN" or Global.world_num > 8 or Global.current_game_mode != Global.GameMode.CAMPAIGN:
|
if Global.current_campaign == "SMBANN":
|
||||||
|
Global.open_disco_results()
|
||||||
|
elif seen or Global.world_num > 8 or Global.current_game_mode != Global.GameMode.CAMPAIGN:
|
||||||
Global.transition_to_scene("res://Scenes/Levels/TitleScreen.tscn")
|
Global.transition_to_scene("res://Scenes/Levels/TitleScreen.tscn")
|
||||||
else:
|
else:
|
||||||
CreditsLevel.go_to_title_screen = false
|
CreditsLevel.go_to_title_screen = false
|
||||||
|
@@ -29,6 +29,9 @@ func set_focus(enabled := false) -> void:
|
|||||||
i.focus_mode = 0 if enabled == false else 2
|
i.focus_mode = 0 if enabled == false else 2
|
||||||
|
|
||||||
func continue_to_next_level() -> void:
|
func continue_to_next_level() -> void:
|
||||||
|
if Global.world_num == 8 and Global.level_num == 4:
|
||||||
|
go_to_menu()
|
||||||
|
return
|
||||||
Global.current_level.transition_to_next_level()
|
Global.current_level.transition_to_next_level()
|
||||||
Global.disco_level_continued.emit()
|
Global.disco_level_continued.emit()
|
||||||
close()
|
close()
|
||||||
|
Reference in New Issue
Block a user