mirrors/Super-Mario-Bros-Remastered-Public
1
Fork 0
mirror of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git synced 2025-12-05 19:20:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use enum

Browse source
This commit is contained in:
kittenchilly 2025-10-21 10:30:44 -05:00
parent fb7476e087
commit 4cdeafdba2
9 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scenes/Prefabs/UI/MarathonPause.tscn
View file

@ -26,7 +26,7 @@ func quit_to_menu() -> void:
SpeedrunHandler.timer = 0
SpeedrunHandler.timer_active = false
SpeedrunHandler.ghost_active = false
TitleScreen.return_to_options2 = true
TitleScreen.return_to = TitleScreen.TITLE_RETURN.OPTIONS2
TitleScreen.return_selected_index = 2
Global.transition_to_scene(\"res://Scenes/Levels/TitleScreen.tscn\")
get_tree().paused = true

2
Scenes/Prefabs/UI/MarathonPracticePause.tscn
View file

@ -25,7 +25,7 @@ func quit_to_menu() -> void:
Global.speed_run_timer = 0
Global.speed_run_timer_active = false
Global.speed_run_timer_enabled = false
TitleScreen.return_to_options2 = true
TitleScreen.return_to = TitleScreen.TITLE_RETURN.OPTIONS2
TitleScreen.return_selected_index = 2
Global.transition_to_scene(\"res://Scenes/Levels/TitleScreen.tscn\")
get_tree().paused = true

4
Scenes/Prefabs/UI/StoryPause.tscn
View file

@ -28,10 +28,10 @@ func quit_to_menu() -> void:
Global.transition_to_scene(\"res://Scenes/Levels/CustomLevelMenu.tscn\")
else:
if Global.current_game_mode == Global.GameMode.CHALLENGE:
TitleScreen.return_to_challenge_options = true
TitleScreen.return_to = TitleScreen.TITLE_RETURN.CHALLENGEOPTIONS
TitleScreen.return_selected_index = 1
elif Global.current_campaign != \"SMBANN\":
TitleScreen.return_to_story_options = true
TitleScreen.return_to = TitleScreen.TITLE_RETURN.STORYOPTIONS
TitleScreen.return_selected_index = 1
Global.transition_to_scene(\"res://Scenes/Levels/TitleScreen.tscn\")
get_tree().paused = true

29
Scripts/Parts/TitleScreen.gd
View file

@ -5,12 +5,13 @@ var selected_index := 0
var active := true
static var title_first_load = true
static var return_to_options2 := false
static var return_to_story_options := false
static var return_to_challenge_options := false
static var return_to_extras := false
static var return_to := TITLE_RETURN.OPTIONS1
static var return_selected_index := 0
var title_return: TITLE_RETURN
enum TITLE_RETURN{OPTIONS1, OPTIONS2, EXTRAS, STORYOPTIONS, CHALLENGEOPTIONS}
@onready var cursor = %Cursor
static var last_theme := "Overworld"
@ -49,27 +50,25 @@ func _ready() -> void:
Global.current_level = null
Global.world_num = clamp(Global.world_num, 1, get_world_count())
update_title()
if return_to_options2:
return_to_options2 = false
if return_to == TITLE_RETURN.OPTIONS2:
%Options1.close()
%Options2.open()
%Options2.selected_index = return_selected_index
elif return_to_story_options:
return_to_story_options = false
elif return_to == TITLE_RETURN.EXTRAS:
%Options1.close()
%Extras.open()
%Extras.selected_index = return_selected_index
elif return_to == TITLE_RETURN.STORYOPTIONS:
get_highscore()
%Options1.close()
%StoryOptions.open()
%StoryOptions.selected_index = return_selected_index
elif return_to_challenge_options:
return_to_challenge_options = false
elif return_to == TITLE_RETURN.CHALLENGEOPTIONS:
%Options1.close()
%ChallengeOptions.open()
%ChallengeOptions.selected_index = return_selected_index
elif return_to_extras:
return_to_extras = false
%Options1.close()
%Extras.open()
%Extras.selected_index = return_selected_index
return_to = TITLE_RETURN.OPTIONS1
return_selected_index = 0
func update_title() -> void:
SaveManager.apply_save(SaveManager.load_save(Global.current_campaign))

2
Scripts/UI/AchievementMenu.gd
View file

@ -19,7 +19,7 @@ func _ready() -> void:
func _process(_delta: float) -> void:
if Input.is_action_just_pressed("ui_back"):
TitleScreen.return_to_extras = true
TitleScreen.return_to = TitleScreen.TITLE_RETURN.EXTRAS
TitleScreen.return_selected_index = 0
Global.transition_to_scene("res://Scenes/Levels/TitleScreen.tscn")

2
Scripts/UI/BooRaceMenu.gd
View file

@ -99,7 +99,7 @@ func handle_input() -> void:
if active == false:
return
if Input.is_action_just_pressed("ui_back"):
TitleScreen.return_to_challenge_options = true
TitleScreen.return_to = TitleScreen.TITLE_RETURN.CHALLENGEOPTIONS
TitleScreen.return_selected_index = 0
Global.transition_to_scene("res://Scenes/Levels/TitleScreen.tscn")
if Input.is_action_just_pressed("ui_accept"):

2
Scripts/UI/ChallengeModeResults.gd
View file

@ -52,7 +52,7 @@ func retry_level() -> void:
Global.transition_to_scene("res://Scenes/Levels/LevelTransition.tscn")
func go_to_title_screen() -> void:
TitleScreen.return_to_challenge_options = true
TitleScreen.return_to = TitleScreen.TITLE_RETURN.CHALLENGEOPTIONS
TitleScreen.return_selected_index = 1
Global.transition_to_scene("res://Scenes/Levels/TitleScreen.tscn")

2
Scripts/UI/Credits.gd
View file

@ -30,7 +30,7 @@ func _process(_delta: float) -> void:
func exit() -> void:
if go_to_title_screen:
if view_from_menu:
TitleScreen.return_to_extras = true
TitleScreen.return_to = TitleScreen.TITLE_RETURN.EXTRAS
TitleScreen.return_selected_index = 1
Global.transition_to_scene("res://Scenes/Levels/TitleScreen.tscn")
else:

2
Scripts/UI/MarathonResults.gd
View file

@ -84,7 +84,7 @@ func restart_level() -> void:
close()
func go_to_menu() -> void:
TitleScreen.return_to_options2 = true
TitleScreen.return_to = TitleScreen.TITLE_RETURN.OPTIONS2
TitleScreen.return_selected_index = 2
Global.transition_to_scene("res://Scenes/Levels/TitleScreen.tscn")