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

ANN now has its own menu + bugfixes

Browse source 
This gives ANN its own dedicated menu rather than throwing you directly into the world selection menu, which additionally fixes an issue with rendering medal icons when selecting the campaign, and a few other fixes like the DiscoResults menu not using the ANN visual settings.
This commit is contained in:
SkyanUltra 2025-12-01 23:16:09 -05:00
parent c5cfc57cbc
commit efca6eac1a
5 changed files with 64 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Scenes/Levels/TitleScreen.tscn
View file

@ -409,6 +409,38 @@ custom_minimum_size = Vector2(0, 16)
layout_mode = 2
size_flags_horizontal = 4
[node name="Options2Stripped" type="VBoxContainer" parent="CanvasLayer" unique_id=1380814024 node_paths=PackedStringArray("options")]
unique_name_in_owner = true
visible = false
custom_minimum_size = Vector2(9, 0)
anchors_preset = 7
anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
offset_left = -36.0
offset_top = -64.0
offset_right = 320.0
grow_horizontal = 2
grow_vertical = 0
size_flags_horizontal = 4
size_flags_vertical = 10
theme_override_constants/separation = 0
script = ExtResource("9_dsf7o")
options = [NodePath("LevelSelect")]
[node name="LevelSelect" type="Label" parent="CanvasLayer/Options2Stripped" unique_id=1533418499]
layout_mode = 2
size_flags_horizontal = 0
theme_override_colors/font_shadow_color = Color(0, 0, 0, 1)
text = "MENU_LEVEL_SELECT"
uppercase = true
[node name="Buffer" type="Control" parent="CanvasLayer/Options2Stripped" unique_id=647277270]
custom_minimum_size = Vector2(0, 16)
layout_mode = 2
size_flags_horizontal = 4
[node name="Extras" type="VBoxContainer" parent="CanvasLayer" unique_id=1702414525 node_paths=PackedStringArray("options")]
unique_name_in_owner = true
visible = false
@ -1532,6 +1564,9 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
[connection signal="option_2_selected" from="CanvasLayer/Options2" to="CanvasLayer/Options2" method="close"]
[connection signal="option_2_selected" from="CanvasLayer/Options2" to="CanvasLayer/ChallengeOptions" method="open"]
[connection signal="option_3_selected" from="CanvasLayer/Options2" to="CanvasLayer/MarathonMode/MarathonSelect" method="open"]
[connection signal="closed" from="CanvasLayer/Options2Stripped" to="CanvasLayer/Options1" method="open"]
[connection signal="option_1_selected" from="CanvasLayer/Options2Stripped" to="." method="get_highscore"]
[connection signal="option_1_selected" from="CanvasLayer/Options2Stripped" to="CanvasLayer/AllNightNippon/WorldSelect" method="open"]
[connection signal="closed" from="CanvasLayer/Extras" to="CanvasLayer/Options1" method="open"]
[connection signal="option_1_selected" from="CanvasLayer/Extras" to="." method="go_to_achievement_menu"]
[connection signal="option_2_selected" from="CanvasLayer/Extras" to="." method="go_to_credits"]
@ -1563,7 +1598,7 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
[connection signal="option_1_selected" from="CanvasLayer/ChallengeOptions" to="." method="go_to_boo_menu"]
[connection signal="option_2_selected" from="CanvasLayer/ChallengeOptions" to="." method="challenge_hunt_selected"]
[connection signal="option_3_selected" from="CanvasLayer/ChallengeOptions" to="." method="world_9_selected"]
[connection signal="cancelled" from="CanvasLayer/ChallengeHunt/WorldSelect" to="CanvasLayer/ChallengeOptions" method="open"]
[connection signal="cancelled" from="CanvasLayer/ChallengeHunt/WorldSelect" to="CanvasLayer/Options2Stripped" method="open"]
[connection signal="world_selected" from="CanvasLayer/ChallengeHunt/WorldSelect" to="CanvasLayer/ChallengeHunt/LevelSelect" method="open"]
[connection signal="cancelled" from="CanvasLayer/ChallengeHunt/LevelSelect" to="CanvasLayer/ChallengeHunt/WorldSelect" method="open"]
[connection signal="level_selected" from="CanvasLayer/ChallengeHunt/LevelSelect" to="CanvasLayer/ChallengeHunt/CharacterSelect" method="open"]
@ -1575,7 +1610,7 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
[connection signal="level_selected" from="CanvasLayer/World9/ExtraLevelSelect" to="CanvasLayer/World9/CharacterSelect" method="open"]
[connection signal="cancelled" from="CanvasLayer/World9/CharacterSelect" to="CanvasLayer/World9/ExtraLevelSelect" method="open"]
[connection signal="selected" from="CanvasLayer/World9/CharacterSelect" to="." method="start_game"]
[connection signal="cancelled" from="CanvasLayer/AllNightNippon/WorldSelect" to="CanvasLayer/Options1" method="open"]
[connection signal="cancelled" from="CanvasLayer/AllNightNippon/WorldSelect" to="CanvasLayer/Options2Stripped" method="open"]
[connection signal="world_selected" from="CanvasLayer/AllNightNippon/WorldSelect" to="CanvasLayer/AllNightNippon/LevelSelect" method="open"]
[connection signal="cancelled" from="CanvasLayer/AllNightNippon/LevelSelect" to="CanvasLayer/AllNightNippon/WorldSelect" method="open"]
[connection signal="level_selected" from="CanvasLayer/AllNightNippon/LevelSelect" to="CanvasLayer/AllNightNippon/CharacterSelect" method="open"]

45
Scenes/Prefabs/UI/DiscoResults.tscn
View file

@ -14,7 +14,7 @@ color = Color(1, 1, 1, 1)
[sub_resource type="StyleBoxLine" id="StyleBoxLine_lfyeb"]
color = Color(1, 1, 1, 1)
[node name="DiscoResults" type="Control"]
[node name="DiscoResults" type="Control" unique_id=1298188288]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
@ -23,7 +23,7 @@ grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_up7vl")
[node name="PanelContainer" type="PanelContainer" parent="."]
[node name="PanelContainer" type="PanelContainer" parent="." unique_id=1498395662]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
@ -38,15 +38,15 @@ grow_horizontal = 2
grow_vertical = 2
theme_override_styles/panel = ExtResource("1_nfk08")
[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"]
[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer" unique_id=1061658617]
layout_mode = 2
[node name="Label" type="Label" parent="PanelContainer/VBoxContainer"]
[node name="Label" type="Label" parent="PanelContainer/VBoxContainer" unique_id=1367824242]
layout_mode = 2
size_flags_horizontal = 4
text = "YOUR RESULTS"
[node name="HSeparator" type="HSeparator" parent="PanelContainer/VBoxContainer/Label"]
[node name="HSeparator" type="HSeparator" parent="PanelContainer/VBoxContainer/Label" unique_id=1977156132]
layout_mode = 1
anchors_preset = 12
anchor_top = 1.0
@ -57,28 +57,28 @@ grow_horizontal = 2
grow_vertical = 0
theme_override_styles/separator = SubResource("StyleBoxLine_6886a")
[node name="Score" type="HBoxContainer" parent="PanelContainer/VBoxContainer"]
[node name="Score" type="HBoxContainer" parent="PanelContainer/VBoxContainer" unique_id=277801092]
layout_mode = 2
[node name="Title" type="Label" parent="PanelContainer/VBoxContainer/Score"]
[node name="Title" type="Label" parent="PanelContainer/VBoxContainer/Score" unique_id=168254607]
layout_mode = 2
text = "SCORE:"
[node name="Score" type="Label" parent="PanelContainer/VBoxContainer/Score"]
[node name="Score" type="Label" parent="PanelContainer/VBoxContainer/Score" unique_id=1767125717]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 0
text = "000000"
[node name="Rank" type="HBoxContainer" parent="PanelContainer/VBoxContainer"]
[node name="Rank" type="HBoxContainer" parent="PanelContainer/VBoxContainer" unique_id=1686368771]
layout_mode = 2
[node name="Title" type="Label" parent="PanelContainer/VBoxContainer/Rank"]
[node name="Title" type="Label" parent="PanelContainer/VBoxContainer/Rank" unique_id=678139659]
layout_mode = 2
size_flags_vertical = 0
text = "RANK:"
[node name="Medal" type="NinePatchRect" parent="PanelContainer/VBoxContainer/Rank"]
[node name="Medal" type="NinePatchRect" parent="PanelContainer/VBoxContainer/Rank" unique_id=52736512]
unique_name_in_owner = true
custom_minimum_size = Vector2(16, 16)
layout_mode = 2
@ -88,45 +88,45 @@ region_rect = Rect2(16, 0, 16, 16)
script = ExtResource("3_up7vl")
metadata/_custom_type_script = "uid://xem6lai3ufyj"
[node name="RankMessage" type="Label" parent="PanelContainer/VBoxContainer/Rank"]
[node name="RankMessage" type="Label" parent="PanelContainer/VBoxContainer/Rank" unique_id=571890284]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 4
text = "FAIL!"
uppercase = true
[node name="HSeparator" type="HSeparator" parent="PanelContainer/VBoxContainer"]
[node name="HSeparator" type="HSeparator" parent="PanelContainer/VBoxContainer" unique_id=1051377687]
layout_mode = 2
theme_override_styles/separator = SubResource("StyleBoxLine_lfyeb")
[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer"]
[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer" unique_id=1493933591]
layout_mode = 2
theme_override_constants/margin_left = 4
[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/VBoxContainer/MarginContainer"]
[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/VBoxContainer/MarginContainer" unique_id=1607230461]
layout_mode = 2
[node name="Continue" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer" instance=ExtResource("4_lxtk8")]
[node name="Continue" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer" unique_id=1776656853 instance=ExtResource("4_lxtk8")]
unique_name_in_owner = true
layout_mode = 2
text = "CONTINUE"
[node name="Retry" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer" instance=ExtResource("4_lxtk8")]
[node name="Retry" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer" unique_id=1308037190 instance=ExtResource("4_lxtk8")]
unique_name_in_owner = true
layout_mode = 2
text = "RETRY"
[node name="LevelSelect" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer" instance=ExtResource("4_lxtk8")]
[node name="LevelSelect" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer" unique_id=84515105 instance=ExtResource("4_lxtk8")]
unique_name_in_owner = true
layout_mode = 2
text = "LEVEL SELECT"
[node name="ReturnMenu" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer" instance=ExtResource("4_lxtk8")]
[node name="ReturnMenu" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer" unique_id=2105400998 instance=ExtResource("4_lxtk8")]
unique_name_in_owner = true
layout_mode = 2
text = "RETURN TO MENU"
[node name="WorldSelect" parent="." instance=ExtResource("6_lfyeb")]
[node name="WorldSelect" parent="." unique_id=2048757589 instance=ExtResource("6_lfyeb")]
visible = false
layout_mode = 1
anchors_preset = 8
@ -140,8 +140,9 @@ offset_right = 90.0
offset_bottom = 32.5
grow_horizontal = 2
grow_vertical = 2
has_disco_stuff = true
[node name="LevelSelect" parent="." instance=ExtResource("7_mjrut")]
[node name="LevelSelect" parent="." unique_id=1828692017 instance=ExtResource("7_mjrut")]
visible = false
layout_mode = 1
anchors_preset = 8
@ -164,8 +165,8 @@ grow_vertical = 2
[connection signal="pressed" from="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/LevelSelect" to="WorldSelect" method="open"]
[connection signal="pressed" from="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/LevelSelect" to="." method="set_focus" binds= [false]]
[connection signal="focus_entered" from="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/ReturnMenu" to="." method="set_index" binds= [3]]
[connection signal="pressed" from="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/ReturnMenu" to="." method="go_to_menu"]
[connection signal="pressed" from="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/ReturnMenu" to="." method="close"]
[connection signal="pressed" from="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/ReturnMenu" to="." method="go_to_menu"]
[connection signal="cancelled" from="WorldSelect" to="." method="open"]
[connection signal="cancelled" from="WorldSelect" to="." method="set_focus" binds= [true]]
[connection signal="world_selected" from="WorldSelect" to="LevelSelect" method="open"]

1
Scenes/Prefabs/UI/WorldSelect.tscn
View file

@ -142,6 +142,7 @@ script = ExtResource("5_6gt41")
metadata/_custom_type_script = "uid://xem6lai3ufyj"
[node name="Medal" type="TextureRect" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer/ScrollContainer/SlotContainer/Slot1/Icon" unique_id=716047762]
visible = false
layout_mode = 1
anchors_preset = -1
anchor_left = 0.75000006

4
Scripts/Parts/TitleScreen.gd
View file

@ -71,14 +71,14 @@ func _process(_delta: float) -> void:
$BGM.play()
func campaign_selected() -> void:
$CanvasLayer/Options1.close()
if last_campaign != Global.current_campaign:
last_campaign = Global.current_campaign
update_title()
if Global.current_campaign == "SMBANN":
Global.current_game_mode = Global.GameMode.CAMPAIGN
$CanvasLayer/AllNightNippon/WorldSelect.open()
$CanvasLayer/Options2Stripped.open()
return
$CanvasLayer/Options1.close()
$CanvasLayer/Options2.open()
func open_story_options() -> void:

2
Scripts/UI/WorldSelect.gd
View file

@ -98,7 +98,7 @@ func setup_disco_bits(medal_outline: TextureRect, medal: NinePatchRect, s_rank_p
medal.region_rect = Rect2(medal_rect_x, 16, 8, 8)
s_rank_pfx.visible = lowest_rank == 6
p_rank_pfx.visible = lowest_rank == 7
print(medal.region_rect)
func setup_marathon_bits(medal_outline: TextureRect, medal: NinePatchRect, world_num := 1) -> void:
if has_speedrun_stuff == false: return