Merge branch 'main' of github.com:outfrost/godot-wild-jam-66

addons/fmod/.gitignore

@@ -3,3 +3,4 @@
 *.dylib
 *.so
 !libs/**
+~*.dll

game/Game.gd

@@ -3,6 +3,7 @@ extends Node
 
 @onready var main_menu: Control = $UI/MainMenu
 @onready var transition_screen: TransitionScreen = $UI/TransitionScreen
+@onready var music: = $Music
 
 var debug: RefCounted
 
@@ -25,6 +26,7 @@ func _process(delta: float) -> void:
 
 func on_start_game() -> void:
 	main_menu.hide()
+	music.set_parameter("SCENE", 1)
 	scene = load("res://scene/prototype/PrototypeRoom.tscn").instantiate()
 	add_child(scene)
 	scene.prop_finished.connect(prop_finished)
@@ -35,6 +37,7 @@ func back_to_menu() -> void:
 	Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
 	remove_child(scene)
 	scene.queue_free()
+	music.set_parameter("SCENE", 0)
 	main_menu.show()
 
 func prop_finished() -> void:

game/Game.tscn

@@ -28,4 +28,19 @@ visible = false
 layout_mode = 1
 
 [node name="FmodBankLoader" type="FmodBankLoader" parent="."]
-bank_paths = ["res://addons/fmod/Desktop/Master.bank", "res://addons/fmod/Desktop/Master.strings.bank"]
+bank_paths = ["res://addons/fmod/Desktop/Master.strings.bank", "res://addons/fmod/Desktop/Master.bank"]
+
+[node name="Music" type="FmodEventEmitter2D" parent="."]
+event_name = "event:/MUSIC"
+event_guid = "{9972c1b8-1950-4148-8270-43d96a5542f6}"
+autoplay = true
+event_parameter/DETECTION/id = 3904272917760853846
+event_parameter/DETECTION/value = 0.0
+event_parameter/DETECTION/min_value = 0.0
+event_parameter/DETECTION/max_value = 2.0
+event_parameter/DETECTION/default_value = 0.0
+event_parameter/SCENE/id = 4253876191321042138
+event_parameter/SCENE/value = 0.0
+event_parameter/SCENE/min_value = 0.0
+event_parameter/SCENE/max_value = 1.0
+event_parameter/SCENE/default_value = 0.0

game/menu/MainMenu.tscn

@@ -1,10 +1,9 @@
-[gd_scene load_steps=6 format=3 uid="uid://dmfdkwcu73843"]
+[gd_scene load_steps=5 format=3 uid="uid://dmfdkwcu73843"]
 
 [ext_resource type="Theme" uid="uid://cgpmko4d01n84" path="res://game/ui-theme/theme.tres" id="1_7yq1p"]
 [ext_resource type="Script" path="res://game/menu/CreditsPopup.gd" id="2"]
 [ext_resource type="Script" path="res://game/menu/VersionLabel.gd" id="3_426jp"]
 [ext_resource type="Script" path="res://game/menu/MainMenu.gd" id="4"]
-[ext_resource type="Script" path="res://game/menu/Music.gd" id="5_xcr5h"]
 
 [node name="MainMenu" type="Control"]
 layout_mode = 3
@@ -148,9 +147,3 @@ offset_bottom = -16.0
 grow_horizontal = 0
 grow_vertical = 0
 text = "Close"
-
-[node name="Music" type="FmodEventEmitter2D" parent="."]
-event_guid = "{00000000-0000-0000-fc1d-017ae8030080}"
-script = ExtResource("5_xcr5h")
-
-[connection signal="pressed" from="VBoxContainer/PlayButton" to="Music" method="_on_play_button_pressed"]

project.godot

@@ -19,7 +19,7 @@ General/is_memory_tracking_enabled=false
 "Software Format/raw_speaker_count"=0
 General/default_listener_count=1
 General/banks_path="res://addons/fmod/Desktop"
-General/should_load_by_name=false
+General/should_load_by_name=true
 DSP/dsp_buffer_size=512
 DSP/dsp_buffer_count=4
 "3D Settings/doppler_scale"=1.0