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-21 15:08:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public

Browse Source
This commit is contained in:
JHDev2006
2025-10-19 21:31:11 +01:00
parent f77e1510cf 2d0c34ce69
commit 65718342c6
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Scenes/Levels/SMB1/World2/2-1.tscn
View File

@@ -238,7 +238,7 @@ metadata/_custom_type_script = "uid://pfwgmuchergf"
[node name="ChallengeNodes" type="Node" parent="." node_paths=PackedStringArray("nodes_to_delete")] [node name="ChallengeNodes" type="Node" parent="." node_paths=PackedStringArray("nodes_to_delete")]
script = ExtResource("27_nvjju") 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" metadata/_custom_type_script = "uid://cgm3opb5qudc1"
[node name="RedCoin" parent="ChallengeNodes" instance=ExtResource("28_t63mw")] [node name="RedCoin" parent="ChallengeNodes" instance=ExtResource("28_t63mw")]

3
Scenes/Levels/SMB1/World3/3-2.tscn
View File

@@ -164,9 +164,8 @@ position = Vector2(3192, 0)
[node name="Checkpoint" parent="." instance=ExtResource("20_xv2tb")] [node name="Checkpoint" parent="." instance=ExtResource("20_xv2tb")]
position = Vector2(1328, 0) 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") script = ExtResource("21_8rqg6")
nodes_to_delete = [null]
metadata/_custom_type_script = "uid://cgm3opb5qudc1" metadata/_custom_type_script = "uid://cgm3opb5qudc1"
[node name="RedCoin" parent="ChallengeNodes" instance=ExtResource("22_cxldk")] [node name="RedCoin" parent="ChallengeNodes" instance=ExtResource("22_cxldk")]

2
Scenes/Levels/SMB1/World4/4-1.tscn
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")] [node name="ChallengeNodes" type="Node" parent="." node_paths=PackedStringArray("nodes_to_delete")]
script = ExtResource("21_f001g") 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" metadata/_custom_type_script = "uid://cgm3opb5qudc1"
[node name="QuestionBlock" parent="ChallengeNodes" instance=ExtResource("9_vtupl")] [node name="QuestionBlock" parent="ChallengeNodes" instance=ExtResource("9_vtupl")]

2
Scenes/Levels/SMB1/World7/7-3.tscn
View File

@@ -1054,7 +1054,7 @@ position = Vector2(2976, -96)
[node name="InvisibleQuestionBlock" parent="ChallengeNodes" index="5"] [node name="InvisibleQuestionBlock" parent="ChallengeNodes" index="5"]
position = Vector2(504, -104) position = Vector2(504, -104)
[node name="InvisibleQuestionBlock2" parent="ChallengeNodes" index="6" instance=ExtResource("3_dfskb")] [node name="InvisibleQuestionBlock3" parent="ChallengeNodes" index="6" instance=ExtResource("3_dfskb")]
position = Vector2(1176, -104) position = Vector2(1176, -104)
[node name="Enemies" type="Node" parent="." index="13"] [node name="Enemies" type="Node" parent="." index="13"]

2
Scenes/Levels/SMB1/World8/8-2.tscn
View File

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

9
Scripts/Classes/Entities/Player.gd
View File

@@ -698,12 +698,13 @@ func set_power_state_frame() -> void:
can_bump_fly = %Sprite.sprite_frames.has_animation("FlyBump") can_bump_fly = %Sprite.sprite_frames.has_animation("FlyBump")
can_kick_anim = %Sprite.sprite_frames.has_animation("Kick") can_kick_anim = %Sprite.sprite_frames.has_animation("Kick")
func get_power_up(power_name := "") -> void: func get_power_up(power_name := "", give_points := true) -> void:
if is_dead: if is_dead:
return return
Global.score += 1000 if give_points:
DiscoLevel.combo_amount += 1 Global.score += 1000
score_note_spawner.spawn_note(1000) DiscoLevel.combo_amount += 1
score_note_spawner.spawn_note(1000)
AudioManager.play_sfx("power_up", global_position) AudioManager.play_sfx("power_up", global_position)
if Settings.file.difficulty.damage_style == 0 and power_state.state_name != power_name: if Settings.file.difficulty.damage_style == 0 and power_state.state_name != power_name:
if power_name != "Big" and power_state.state_name != "Big": if power_name != "Big" and power_state.state_name != "Big":

2
Scripts/Parts/Checkpoint.gd
View File

@@ -62,7 +62,7 @@ func on_area_entered(area: Area2D) -> void:
sublevel_id = Global.level_editor.sub_level_id sublevel_id = Global.level_editor.sub_level_id
if Settings.file.difficulty.checkpoint_style == 2 and has_meta("is_flag"): if Settings.file.difficulty.checkpoint_style == 2 and has_meta("is_flag"):
if player.power_state.state_name == "Small": if player.power_state.state_name == "Small":
player.get_power_up("Big") player.get_power_up("Big", false)
respawn_position = global_position respawn_position = global_position
crossed.emit(area.owner) crossed.emit(area.owner)