From 47100925c59ee20b8a7c5a19dec192ef8c57425f Mon Sep 17 00:00:00 2001 From: KirbyKidJ <70983335+KirbyKid256@users.noreply.github.com> Date: Thu, 18 Sep 2025 19:13:24 -0700 Subject: [PATCH 1/2] Fixed Title BGM Looping This is a simple bugfix that allows the Title Screen music to loop. It also works with Resource Packs. For the purposes of faithfulness, this fix is only needed for the Lost Levels title music to match the All-Stars counterpart. --- Assets/Audio/BGM/TitleBGM.json | 2 +- Assets/Audio/BGM/TitleSMBLL.bgm | 4 ++++ Scripts/Classes/Components/ResourceSetterNew.gd | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 Assets/Audio/BGM/TitleSMBLL.bgm diff --git a/Assets/Audio/BGM/TitleBGM.json b/Assets/Audio/BGM/TitleBGM.json index 9a211b1..9b58c0f 100644 --- a/Assets/Audio/BGM/TitleBGM.json +++ b/Assets/Audio/BGM/TitleBGM.json @@ -1,7 +1,7 @@ { "variations": { "SMB1": {"source": "TitleSMB.mp3"}, - "SMBLL": {"source": "TitleSMBLL.mp3"}, + "SMBLL": {"source": "TitleSMBLL.bgm"}, "SMBS": {"source": "TitleSMBS.mp3"}, "SMBANN": {"source": "TitleANN.mp3"} } diff --git a/Assets/Audio/BGM/TitleSMBLL.bgm b/Assets/Audio/BGM/TitleSMBLL.bgm new file mode 100644 index 0000000..3e274a5 --- /dev/null +++ b/Assets/Audio/BGM/TitleSMBLL.bgm @@ -0,0 +1,4 @@ +{ + "Normal": {"source": "TitleSMBLL.mp3", "loop": 11.735}, + "Hurry": {"source": "TitleSMBLL.mp3", "loop": 11.735} +} \ No newline at end of file diff --git a/Scripts/Classes/Components/ResourceSetterNew.gd b/Scripts/Classes/Components/ResourceSetterNew.gd index 8f84e50..b5e1a57 100644 --- a/Scripts/Classes/Components/ResourceSetterNew.gd +++ b/Scripts/Classes/Components/ResourceSetterNew.gd @@ -304,7 +304,9 @@ func load_image_from_path(path := "") -> ImageTexture: func load_audio_from_path(path := "") -> AudioStream: var stream = null - if path.contains("res://"): + if path.contains(".bgm"): + stream = AudioManager.generate_interactive_stream(JSON.parse_string(FileAccess.get_file_as_string(path))) + elif path.contains("res://"): return load(path) if path.contains(".wav"): stream = AudioStreamWAV.load_from_file(path) From 7237d562890bb4c907a6012f923bc6d5d43b5733 Mon Sep 17 00:00:00 2001 From: KirbyKidJ <70983335+KirbyKid256@users.noreply.github.com> Date: Thu, 18 Sep 2025 20:17:40 -0700 Subject: [PATCH 2/2] Added Loop Points to the Boo Menu and Pack Support Only put this commit here since A: It's related to the BGM files, and B: It's dependent on the previous commit. --- Assets/Audio/BGM/BooMenu.bgm | 10 ++++++++++ Assets/Audio/BGM/BooMenu.json | 7 +++++++ Scenes/Levels/BooRaceMenu.tscn | 12 ++++++++++-- Scripts/UI/BooRaceMenu.gd | 1 + 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 Assets/Audio/BGM/BooMenu.bgm create mode 100644 Assets/Audio/BGM/BooMenu.json diff --git a/Assets/Audio/BGM/BooMenu.bgm b/Assets/Audio/BGM/BooMenu.bgm new file mode 100644 index 0000000..08ba2cd --- /dev/null +++ b/Assets/Audio/BGM/BooMenu.bgm @@ -0,0 +1,10 @@ +{ + "Normal": { + "source": "BooMenu.mp3", + "loop": 4.797 + }, + "Hurry": { + "source": "BooMenu.mp3", + "loop": 4.797 + } +} diff --git a/Assets/Audio/BGM/BooMenu.json b/Assets/Audio/BGM/BooMenu.json new file mode 100644 index 0000000..4489504 --- /dev/null +++ b/Assets/Audio/BGM/BooMenu.json @@ -0,0 +1,7 @@ +{ + "variations": { + "default": { + "source": "BooMenu.bgm" + } + } +} \ No newline at end of file diff --git a/Scenes/Levels/BooRaceMenu.tscn b/Scenes/Levels/BooRaceMenu.tscn index 1736f52..202972b 100644 --- a/Scenes/Levels/BooRaceMenu.tscn +++ b/Scenes/Levels/BooRaceMenu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=45 format=3 uid="uid://b7no88iaujhh3"] +[gd_scene load_steps=46 format=3 uid="uid://b7no88iaujhh3"] [ext_resource type="Script" uid="uid://b08qfwj5jk6g1" path="res://Scripts/Parts/PlayerSprite.gd" id="1_0b6w1"] [ext_resource type="Script" uid="uid://b3ol0iyjcb5n1" path="res://Scripts/UI/BooRaceMenu.gd" id="1_nk4wu"] @@ -20,6 +20,7 @@ [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="8_xx8pl"] [ext_resource type="StyleBox" uid="uid://comkghpj0djcl" path="res://Resources/UI/Panel.tres" id="9_mm3k3"] [ext_resource type="Texture2D" uid="uid://3p2l7rec0gh5" path="res://Assets/Sprites/UI/Cursor.png" id="10_nk4wu"] +[ext_resource type="JSON" path="res://Assets/Audio/BGM/BooMenu.json" id="11_kqv8e"] [ext_resource type="PackedScene" uid="uid://bxp1l23w1kq41" path="res://Scenes/Prefabs/UI/BooSelect.tscn" id="12_pinst"] [ext_resource type="JSON" path="res://Assets/Sprites/Enemies/RaceBoo.json" id="12_tgnw3"] [ext_resource type="PackedScene" uid="uid://ci678koo0peoa" path="res://Scenes/Prefabs/UI/CharacterSelect.tscn" id="13_u5tsp"] @@ -283,9 +284,16 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik" [node name="Music" type="AudioStreamPlayer" parent="."] stream = ExtResource("1_uucdm") -autoplay = true bus = &"Music" +[node name="ResourceSetterNew" type="Node" parent="Music" node_paths=PackedStringArray("node_to_affect")] +script = ExtResource("8_xx8pl") +node_to_affect = NodePath("..") +property_name = "stream" +mode = 2 +resource_json = ExtResource("11_kqv8e") +metadata/_custom_type_script = "uid://cbal8ms2oe1ik" + [node name="PanelContainer" type="PanelContainer" parent="."] anchors_preset = 8 anchor_left = 0.5 diff --git a/Scripts/UI/BooRaceMenu.gd b/Scripts/UI/BooRaceMenu.gd index e895f12..42b95df 100644 --- a/Scripts/UI/BooRaceMenu.gd +++ b/Scripts/UI/BooRaceMenu.gd @@ -56,6 +56,7 @@ func _ready() -> void: Level.can_set_time = true setup_visuals() %LevelLabels.get_child(BooRaceHandler.current_level_id).grab_focus() + $Music.play() func _exit_tree() -> void: Global.get_node("GameHUD").show()