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 07:28:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main'

Browse Source
This commit is contained in:
jdaster64
2025-09-24 13:01:08 -04:00
parent 368cc148b3 5edc5466b8
commit 407d51220e
10 changed files with 5097 additions and 4372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Scripts/Classes/States/Player/LevelExit.gd
View File

@@ -1,6 +1,7 @@
extends PlayerState
func enter(_msg := {}) -> void:
player.can_hurt = false
player.has_jumped = false
player.crouching = false
player.get_node("CameraCenterJoint/RightWall").set_collision_layer_value(1, false)

28
Scripts/Parts/LevelLoader.gd
View File

@@ -118,13 +118,14 @@ func apply_level_data(data := "") -> void:
level.can_backscroll = bool(values[4])
level.vertical_height = -int(values[5])
level.time_limit = int(values[6])
%ThemeTime.selected = values[1]
%LevelMusic.selected = values[2]
%Campaign.selected = values[3]
%BackScroll.set_pressed_no_signal(bool(values[4]))
%HeightLimit.value = values[5]
%TimeLimit.value = values[6]
%SubLevelID.selected = editor.sub_level_id
if is_instance_valid($TileMenu):
%ThemeTime.selected = values[1]
%LevelMusic.selected = values[2]
%Campaign.selected = values[3]
%BackScroll.set_pressed_no_signal(bool(values[4]))
%HeightLimit.value = values[5]
%TimeLimit.value = values[6]
%SubLevelID.selected = editor.sub_level_id
ResourceSetterNew.cache.clear()
Global.level_theme_changed.emit()
@@ -140,12 +141,13 @@ func apply_bg_data(data := "") -> void:
value = (decode_from_base64_2char(i))
else:
value = (base64_charset.find(i))
if SELECTORS[id] is SpinBox:
SELECTORS[id].value = value
elif SELECTORS[id] is Button:
SELECTORS[id].set_pressed_no_signal(bool(value))
else:
SELECTORS[id].selected = value
if is_instance_valid($TileMenu):
if SELECTORS[id] is SpinBox:
SELECTORS[id].value = value
elif SELECTORS[id] is Button:
SELECTORS[id].set_pressed_no_signal(bool(value))
else:
SELECTORS[id].selected = value
level_bg.set_value(value, BG_VALUES[id])
id += 1

2
Scripts/Parts/LevelTransition.gd
View File

@@ -43,6 +43,8 @@ func _ready() -> void:
Global.p_switch_timer = -1
if Checkpoint.passed:
Door.unlocked_doors = Checkpoint.unlocked_doors.duplicate()
else:
Door.unlocked_doors = []
if Global.current_campaign == "SMBANN":
DiscoLevel.reset_values()
DiscoLevel.first_load = true

2
Scripts/UI/WorldSelect.gd
View File

@@ -39,6 +39,8 @@ func open() -> void:
setup_visuals()
show()
await get_tree().process_frame
if Global.current_game_mode != Global.GameMode.CAMPAIGN:
selected_world = clamp(selected_world, 0, 7)
$%SlotContainer.get_child(selected_world).grab_focus()
active = true