GitHub/Super-Mario-Bros.-Remastered-Public
1
0
Fork 0
mirror of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git synced 2025-10-28 18:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

have tested all levels in the contest with this new fork, all ran great, pretty happy to merge this after a bit of a tidy up

Browse Source
This commit is contained in:
JHDev2006
2025-10-27 09:42:22 +00:00
parent 53f3bce94c
commit 2b50a648f7
4 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Scenes/Levels/LevelTransition.tscn
View File

@@ -279,18 +279,38 @@ region_rect = Rect2(8, 0, 8, 8)
script = ExtResource("6_abjth") script = ExtResource("6_abjth")
metadata/_custom_type_script = "uid://364rywt44hy6" metadata/_custom_type_script = "uid://364rywt44hy6"
[node name="Loading" type="Label" parent="BG"]
unique_name_in_owner = true
process_thread_group = 2
process_thread_group_order = 0
process_thread_messages = 0
visible = false
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -96.0
offset_top = 8.0
offset_right = 96.0
offset_bottom = 32.0
grow_horizontal = 2
grow_vertical = 2
text = "BUILDING LEVEL..."
horizontal_alignment = 1
[node name="Timer" type="Timer" parent="."] [node name="Timer" type="Timer" parent="."]
wait_time = 3.0 wait_time = 3.0
one_shot = true one_shot = true
[node name="LabelFontChanger" type="Node" parent="." node_paths=PackedStringArray("labels")] [node name="LabelFontChanger" type="Node" parent="." node_paths=PackedStringArray("labels")]
script = ExtResource("8_ehrek") script = ExtResource("8_ehrek")
labels = [NodePath("../BG/Control/World"), NodePath("../BG/Control/LivesCount"), NodePath("../BG/Control/MarathonPB"), NodePath("../BG/Control/WorldNum"), NodePath("../BG/Control/CustomLevelName"), NodePath("../BG/Control/CustomLevelAuthor"), NodePath("../BG/Control/ChallengeScore"), NodePath("../BG/Control/ChallengeScoreText"), NodePath("../BG/Control/ChallengeScoreText/Target"), NodePath("../BG/Control/ChallengeCoins2")] labels = [NodePath("../BG/Control/World"), NodePath("../BG/Control/LivesCount"), NodePath("../BG/Control/MarathonPB"), NodePath("../BG/Control/WorldNum"), NodePath("../BG/Control/CustomLevelName"), NodePath("../BG/Control/CustomLevelAuthor"), NodePath("../BG/Control/ChallengeScore"), NodePath("../BG/Control/ChallengeScoreText"), NodePath("../BG/Control/ChallengeScoreText/Target"), NodePath("../BG/Control/ChallengeCoins2"), NodePath("../BG/Loading")]
metadata/_custom_type_script = "uid://co6tjg3w6qpd8" metadata/_custom_type_script = "uid://co6tjg3w6qpd8"
[node name="TextShadowColourChanger" type="Node" parent="." node_paths=PackedStringArray("labels", "shadow_node")] [node name="TextShadowColourChanger" type="Node" parent="." node_paths=PackedStringArray("labels", "shadow_node")]
script = ExtResource("10_abjth") script = ExtResource("10_abjth")
labels = [NodePath("../BG/Control/World"), NodePath("../BG/Control/LivesCount"), NodePath("../BG/Control/MarathonPB"), NodePath("../BG/Control/WorldNum"), NodePath("../BG/Control/CustomLevelName"), NodePath("../BG/Control/CustomLevelAuthor"), NodePath("../BG/Control/ChallengeScoreText"), NodePath("../BG/Control/ChallengeScore"), NodePath("../BG/Control/ChallengeScoreText/Target"), NodePath("../BG/Control/ChallengeCoins2")] labels = [NodePath("../BG/Control/World"), NodePath("../BG/Control/LivesCount"), NodePath("../BG/Control/MarathonPB"), NodePath("../BG/Control/WorldNum"), NodePath("../BG/Control/CustomLevelName"), NodePath("../BG/Control/CustomLevelAuthor"), NodePath("../BG/Control/ChallengeScoreText"), NodePath("../BG/Control/ChallengeScore"), NodePath("../BG/Control/ChallengeScoreText/Target"), NodePath("../BG/Control/ChallengeCoins2"), NodePath("../BG/Loading")]
shadow_node = NodePath("../BG/Control/ChallengeCoins/1/Shadow") shadow_node = NodePath("../BG/Control/ChallengeCoins/1/Shadow")
metadata/_custom_type_script = "uid://dt2p68xl462v2" metadata/_custom_type_script = "uid://dt2p68xl462v2"

4
Scripts/Classes/Entities/Enemies/Podoboo.gd
View File

@@ -12,10 +12,6 @@ signal killed
const BASE_LINE := 48 const BASE_LINE := 48
func _ready() -> void:
if Global.current_game_mode != Global.GameMode.LEVEL_EDITOR and global_position.y > -32:
Global.log_warning("Podoboo is too low! Forgot to update!")
func _physics_process(delta: float) -> void: func _physics_process(delta: float) -> void:
velocity += (5 / delta) * delta velocity += (5 / delta) * delta
velocity = clamp(velocity, -INF, 280) velocity = clamp(velocity, -INF, 280)

3
Scripts/Classes/LevelClass.gd
View File

@@ -84,7 +84,8 @@ static var can_set_time := true
func _enter_tree() -> void: func _enter_tree() -> void:
Global.current_level = self Global.current_level = self
update_theme() if is_inside_tree():
update_theme()
SpeedrunHandler.timer_active = true SpeedrunHandler.timer_active = true
SpeedrunHandler.ghost_active = true SpeedrunHandler.ghost_active = true
if can_set_time: if can_set_time:

4
Scripts/Parts/LevelTransition.gd
View File

@@ -40,6 +40,7 @@ func _ready() -> void:
Level.in_vine_level = false Level.in_vine_level = false
Global.p_switch_active = false Global.p_switch_active = false
Lakitu.present = false Lakitu.present = false
Door.exiting_door_id = -1
Global.p_switch_timer = -1 Global.p_switch_timer = -1
if Checkpoint.passed_checkpoints.is_empty() == false: if Checkpoint.passed_checkpoints.is_empty() == false:
Door.unlocked_doors = Checkpoint.unlocked_doors.duplicate() Door.unlocked_doors = Checkpoint.unlocked_doors.duplicate()
@@ -103,6 +104,8 @@ func _ready() -> void:
Global.clear_saved_values() Global.clear_saved_values()
Global.reset_values() Global.reset_values()
wait_for_build_completion() wait_for_build_completion()
%Loading.show()
await get_tree().create_timer(0.1, false).timeout
NewLevelBuilder.load_level(LevelEditor.level_file) NewLevelBuilder.load_level(LevelEditor.level_file)
else: else:
await get_tree().create_timer(0.1, false).timeout await get_tree().create_timer(0.1, false).timeout
@@ -111,6 +114,7 @@ func _ready() -> void:
func wait_for_build_completion() -> void: func wait_for_build_completion() -> void:
await NewLevelBuilder.level_building_complete await NewLevelBuilder.level_building_complete
can_transition = true can_transition = true
%Loading.hide()
func handle_challenge_mode_transition() -> void: func handle_challenge_mode_transition() -> void:
$BG/Control/LivesCount.hide() $BG/Control/LivesCount.hide()