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-22 15:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed dying causing 2 lives to be taken, instead of 1

Browse Source
This commit is contained in:
JHDev2006
2025-09-15 09:59:33 +01:00
parent 5b58dc1d74
commit 9228b7bca1
2 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
Scenes/Levels/SMB1/CoinHeavens/1.tscn
View File

@@ -1092,44 +1092,44 @@ overlay_clouds = true
[node name="CoinHeavenAllCoinsBonus" parent="." instance=ExtResource("35_rftvu")] [node name="CoinHeavenAllCoinsBonus" parent="." instance=ExtResource("35_rftvu")]
[connection signal="collected" from="Tiles/Coin" to="Tiles/Coin/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/Coin" to="Tiles/Coin/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121982" to="Tiles/@Node2D@121982/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27884" to="Tiles/@Node2D@27884/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121983" to="Tiles/@Node2D@121983/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27885" to="Tiles/@Node2D@27885/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121984" to="Tiles/@Node2D@121984/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27886" to="Tiles/@Node2D@27886/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121985" to="Tiles/@Node2D@121985/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27887" to="Tiles/@Node2D@27887/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121986" to="Tiles/@Node2D@121986/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27888" to="Tiles/@Node2D@27888/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121987" to="Tiles/@Node2D@121987/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27889" to="Tiles/@Node2D@27889/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121988" to="Tiles/@Node2D@121988/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27890" to="Tiles/@Node2D@27890/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121989" to="Tiles/@Node2D@121989/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27891" to="Tiles/@Node2D@27891/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121990" to="Tiles/@Node2D@121990/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27892" to="Tiles/@Node2D@27892/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121991" to="Tiles/@Node2D@121991/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27893" to="Tiles/@Node2D@27893/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121992" to="Tiles/@Node2D@121992/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27894" to="Tiles/@Node2D@27894/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121993" to="Tiles/@Node2D@121993/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27895" to="Tiles/@Node2D@27895/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121994" to="Tiles/@Node2D@121994/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27896" to="Tiles/@Node2D@27896/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121995" to="Tiles/@Node2D@121995/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27897" to="Tiles/@Node2D@27897/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121996" to="Tiles/@Node2D@121996/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27898" to="Tiles/@Node2D@27898/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121997" to="Tiles/@Node2D@121997/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27899" to="Tiles/@Node2D@27899/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121998" to="Tiles/@Node2D@121998/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27900" to="Tiles/@Node2D@27900/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@121999" to="Tiles/@Node2D@121999/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27901" to="Tiles/@Node2D@27901/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122000" to="Tiles/@Node2D@122000/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27902" to="Tiles/@Node2D@27902/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122001" to="Tiles/@Node2D@122001/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27903" to="Tiles/@Node2D@27903/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122002" to="Tiles/@Node2D@122002/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27904" to="Tiles/@Node2D@27904/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122003" to="Tiles/@Node2D@122003/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27905" to="Tiles/@Node2D@27905/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122004" to="Tiles/@Node2D@122004/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27906" to="Tiles/@Node2D@27906/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122005" to="Tiles/@Node2D@122005/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27907" to="Tiles/@Node2D@27907/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122006" to="Tiles/@Node2D@122006/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27908" to="Tiles/@Node2D@27908/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122007" to="Tiles/@Node2D@122007/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27909" to="Tiles/@Node2D@27909/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122008" to="Tiles/@Node2D@122008/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27910" to="Tiles/@Node2D@27910/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122009" to="Tiles/@Node2D@122009/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27911" to="Tiles/@Node2D@27911/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122010" to="Tiles/@Node2D@122010/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27912" to="Tiles/@Node2D@27912/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122011" to="Tiles/@Node2D@122011/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27913" to="Tiles/@Node2D@27913/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122012" to="Tiles/@Node2D@122012/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27914" to="Tiles/@Node2D@27914/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122013" to="Tiles/@Node2D@122013/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27915" to="Tiles/@Node2D@27915/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122014" to="Tiles/@Node2D@122014/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27916" to="Tiles/@Node2D@27916/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122015" to="Tiles/@Node2D@122015/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27917" to="Tiles/@Node2D@27917/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122016" to="Tiles/@Node2D@122016/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27918" to="Tiles/@Node2D@27918/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122017" to="Tiles/@Node2D@122017/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27919" to="Tiles/@Node2D@27919/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122018" to="Tiles/@Node2D@122018/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27920" to="Tiles/@Node2D@27920/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122019" to="Tiles/@Node2D@122019/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27921" to="Tiles/@Node2D@27921/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122020" to="Tiles/@Node2D@122020/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27922" to="Tiles/@Node2D@27922/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@122021" to="Tiles/@Node2D@122021/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@27923" to="Tiles/@Node2D@27923/LevelPersistance" method="set_as_active"]
[connection signal="player_entered" from="WarpDown" to="." method="warp_back"] [connection signal="player_entered" from="WarpDown" to="." method="warp_back"]

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

@@ -533,6 +533,8 @@ func die(pit := false) -> void:
func death_load() -> void: func death_load() -> void:
power_state = get_node("PowerStates/Small") power_state = get_node("PowerStates/Small")
Global.player_power_states = "0000" Global.player_power_states = "0000"
if Global.death_load:
return
Global.death_load = true Global.death_load = true
if Global.current_game_mode == Global.GameMode.CUSTOM_LEVEL: if Global.current_game_mode == Global.GameMode.CUSTOM_LEVEL:
LevelTransition.level_to_transition_to = "res://Scenes/Levels/LevelEditor.tscn" LevelTransition.level_to_transition_to = "res://Scenes/Levels/LevelEditor.tscn"