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 23:18:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated 2-4 to not kill the player when below the screen, in anti grav

Browse Source
This commit is contained in:
JHDev2006
2025-09-22 13:29:14 +01:00
parent cdb7348c67
commit 11fbbaaa7d
3 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Scenes/Levels/SMBS/YouVsBoo/Boo2-4.tscn
View File

@@ -53,7 +53,7 @@ tile_map_data = PackedByteArray("AAD8//X/AAAAAAUAAAD9//X/AAABAAUAAAD+//X/AAABAAU
polygon = NodePath("CollisionPolygon2D")
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="UpsideDownGravityArea"]
polygon = PackedVector2Array(-64, -160, -64, 32, 448, 32, 448, -112, 336, -112, 336, -64, 128, -64, 128, -160)
polygon = PackedVector2Array(-64, -160, -64, 128, 448, 128, 448, -112, 336, -112, 336, -64, 128, -64, 128, -160)
[node name="UpsideDownGravityArea2" parent="." node_paths=PackedStringArray("polygon") instance=ExtResource("9_14153")]
polygon = NodePath("CollisionPolygon2D")
@@ -121,37 +121,39 @@ tile_map_data = PackedByteArray("AADy//3/AAAEAAAAAADy//7/AAAEAAEAAADy////AAAAAAE
[connection signal="shell_block_hit" from="Tiles/TimedBooBlock" to="Tiles/TimedBooBlock/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="block_destroyed" from="Tiles/BrickBlock" to="Tiles/BrickBlock/LevelPersistance" method="set_as_active_2"]
[connection signal="block_emptied" from="Tiles/BrickBlock" to="Tiles/BrickBlock/LevelPersistance" method="set_as_active"]
[connection signal="item_changed" from="Tiles/BrickBlock" to="Tiles/BrickBlock" method="check_brick_empty"]
[connection signal="player_block_hit" from="Tiles/BrickBlock" to="Tiles/BrickBlock" method="on_block_hit"]
[connection signal="player_block_hit" from="Tiles/BrickBlock" to="Tiles/BrickBlock/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/BrickBlock" to="Tiles/BrickBlock" method="on_shell_block_hit"]
[connection signal="shell_block_hit" from="Tiles/BrickBlock" to="Tiles/BrickBlock/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@69713" to="Tiles/@AnimatableBody2D@69713/LevelPersistance" method="set_as_active_2"]
[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@69713" to="Tiles/@AnimatableBody2D@69713/LevelPersistance" method="set_as_active"]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@69713" to="Tiles/@AnimatableBody2D@69713" method="player_mushroom_check"]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@69713" to="Tiles/@AnimatableBody2D@69713" method="dispense_item" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@69713" to="Tiles/@AnimatableBody2D@69713/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@69713" to="Tiles/@AnimatableBody2D@69713" method="dispense_item" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@69713" to="Tiles/@AnimatableBody2D@69713/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@69749" to="Tiles/@AnimatableBody2D@69749" method="block_hit" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@69749" to="Tiles/@AnimatableBody2D@69749/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@69749" to="Tiles/@AnimatableBody2D@69749" method="block_hit" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@69749" to="Tiles/@AnimatableBody2D@69749/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@69750" to="Tiles/@AnimatableBody2D@69750" method="block_hit" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@69750" to="Tiles/@AnimatableBody2D@69750/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@69750" to="Tiles/@AnimatableBody2D@69750" method="block_hit" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@69750" to="Tiles/@AnimatableBody2D@69750/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@69751" to="Tiles/@AnimatableBody2D@69751" method="block_hit" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@69751" to="Tiles/@AnimatableBody2D@69751/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@69751" to="Tiles/@AnimatableBody2D@69751" method="block_hit" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@69751" to="Tiles/@AnimatableBody2D@69751/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@69752" to="Tiles/@AnimatableBody2D@69752/LevelPersistance" method="set_as_active_2"]
[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@69752" to="Tiles/@AnimatableBody2D@69752/LevelPersistance" method="set_as_active"]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@69752" to="Tiles/@AnimatableBody2D@69752" method="on_block_hit"]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@69752" to="Tiles/@AnimatableBody2D@69752/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@69752" to="Tiles/@AnimatableBody2D@69752" method="on_shell_block_hit"]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@69752" to="Tiles/@AnimatableBody2D@69752/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@69763" to="Tiles/@AnimatableBody2D@69763" method="block_hit" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@69763" to="Tiles/@AnimatableBody2D@69763/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@69763" to="Tiles/@AnimatableBody2D@69763" method="block_hit" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@69763" to="Tiles/@AnimatableBody2D@69763/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@113789" to="Tiles/@AnimatableBody2D@113789/LevelPersistance" method="set_as_active_2"]
[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@113789" to="Tiles/@AnimatableBody2D@113789/LevelPersistance" method="set_as_active"]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@113789" to="Tiles/@AnimatableBody2D@113789" method="player_mushroom_check"]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@113789" to="Tiles/@AnimatableBody2D@113789" method="dispense_item" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@113789" to="Tiles/@AnimatableBody2D@113789/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@113789" to="Tiles/@AnimatableBody2D@113789" method="dispense_item" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@113789" to="Tiles/@AnimatableBody2D@113789/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@113825" to="Tiles/@AnimatableBody2D@113825" method="block_hit" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@113825" to="Tiles/@AnimatableBody2D@113825/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@113825" to="Tiles/@AnimatableBody2D@113825" method="block_hit" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@113825" to="Tiles/@AnimatableBody2D@113825/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@113826" to="Tiles/@AnimatableBody2D@113826" method="block_hit" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@113826" to="Tiles/@AnimatableBody2D@113826/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@113826" to="Tiles/@AnimatableBody2D@113826" method="block_hit" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@113826" to="Tiles/@AnimatableBody2D@113826/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@113827" to="Tiles/@AnimatableBody2D@113827" method="block_hit" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@113827" to="Tiles/@AnimatableBody2D@113827/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@113827" to="Tiles/@AnimatableBody2D@113827" method="block_hit" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@113827" to="Tiles/@AnimatableBody2D@113827/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@113828" to="Tiles/@AnimatableBody2D@113828/LevelPersistance" method="set_as_active_2"]
[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@113828" to="Tiles/@AnimatableBody2D@113828/LevelPersistance" method="set_as_active"]
[connection signal="item_changed" from="Tiles/@AnimatableBody2D@113828" to="Tiles/@AnimatableBody2D@113828" method="check_brick_empty"]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@113828" to="Tiles/@AnimatableBody2D@113828" method="on_block_hit"]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@113828" to="Tiles/@AnimatableBody2D@113828/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@113828" to="Tiles/@AnimatableBody2D@113828" method="on_shell_block_hit"]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@113828" to="Tiles/@AnimatableBody2D@113828/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@113839" to="Tiles/@AnimatableBody2D@113839" method="block_hit" unbinds=1]
[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@113839" to="Tiles/@AnimatableBody2D@113839/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@113839" to="Tiles/@AnimatableBody2D@113839" method="block_hit" unbinds=1]
[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@113839" to="Tiles/@AnimatableBody2D@113839/BlockAnimations" method="bounce_block" unbinds=1]
[connection signal="player_reached" from="EndFlagpole" to="BooRaceHandler" method="player_win_race"]

2
Scripts/Classes/Singletons/Global.gd
View File

@@ -117,7 +117,7 @@ var can_time_tick := true:
if value == false:
pass
var player_power_states := "1000"
var player_power_states := "0000"
var connected_players := 1

2
Scripts/Classes/States/Player/Normal.gd
View File

@@ -27,7 +27,7 @@ func physics_update(delta: float) -> void:
handle_death_pits()
func handle_death_pits() -> void:
if player.global_position.y > 64 and not Level.in_vine_level and player.auto_death_pit:
if player.global_position.y > 64 and not Level.in_vine_level and player.auto_death_pit and player.gravity_vector == Vector2.DOWN:
player.die(true)
elif player.global_position.y < Global.current_level.vertical_height - 32 and player.gravity_vector == Vector2.UP:
player.die(true)