summaryrefslogtreecommitdiff
path: root/scenes
diff options
context:
space:
mode:
authorLogan <logan@cflip.net>2023-02-01 17:44:17 -0700
committerLogan <logan@cflip.net>2023-02-01 17:44:17 -0700
commitdd91a66238b1df039321c9a11e7c038e50b45c21 (patch)
tree29a8c79a5155a0f9e7fb4e88f80ebdf7bbad5bda /scenes
parent0d0be8268275ca42dae0899e405bcc000c445a20 (diff)
Added music scene singleton
Diffstat (limited to 'scenes')
-rw-r--r--scenes/audio.tscn10
-rw-r--r--scenes/level.tscn5
-rw-r--r--scenes/mainmenu.tscn15
3 files changed, 28 insertions, 2 deletions
diff --git a/scenes/audio.tscn b/scenes/audio.tscn
new file mode 100644
index 0000000..a6c0cf7
--- /dev/null
+++ b/scenes/audio.tscn
@@ -0,0 +1,10 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://sound/unused_music.ogg" type="AudioStream" id=1]
+
+[node name="Audio" type="Node"]
+pause_mode = 2
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 1 )
+volume_db = -20.0
diff --git a/scenes/level.tscn b/scenes/level.tscn
index c071819..43f5689 100644
--- a/scenes/level.tscn
+++ b/scenes/level.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=11 format=2]
[ext_resource path="res://textures/court_lines.png" type="Texture" id=1]
[ext_resource path="res://scenes/hoop.tscn" type="PackedScene" id=2]
@@ -6,6 +6,7 @@
[ext_resource path="res://scenes/interface.tscn" type="PackedScene" id=4]
[ext_resource path="res://textures/court_tile.png" type="Texture" id=5]
[ext_resource path="res://scripts/camera.gd" type="Script" id=6]
+[ext_resource path="res://scenes/audio.tscn" type="PackedScene" id=7]
[sub_resource type="LineShape2D" id=1]
d = 10.0
@@ -81,6 +82,8 @@ position = Vector2( 163, 37 )
[node name="Basketball" parent="." instance=ExtResource( 3 )]
position = Vector2( 123, 73 )
+[node name="Audio" parent="." instance=ExtResource( 7 )]
+
[connection signal="score" from="Hoop" to="Interface" method="_on_Hoop_score"]
[connection signal="score" from="Hoop" to="Basketball" method="_on_Hoop_score"]
[connection signal="reset" from="Basketball" to="Camera2D" method="_on_Basketball_reset"]
diff --git a/scenes/mainmenu.tscn b/scenes/mainmenu.tscn
index f3a0776..492435a 100644
--- a/scenes/mainmenu.tscn
+++ b/scenes/mainmenu.tscn
@@ -1,6 +1,9 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=5 format=2]
[ext_resource path="res://scripts/mainmenu.gd" type="Script" id=1]
+[ext_resource path="res://sound/announcer_mainmenu.ogg" type="AudioStream" id=2]
+[ext_resource path="res://sound/unused_music.ogg" type="AudioStream" id=3]
+[ext_resource path="res://theme_data/interface_theme.tres" type="Theme" id=4]
[node name="Menu" type="Control"]
margin_right = 214.0
@@ -74,6 +77,16 @@ margin_right = 100.0
margin_bottom = 152.0
text = "Quit"
+[node name="MusicAudio" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 3 )
+volume_db = -30.0
+stream_paused = true
+
+[node name="AnnouncerAudio" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 2 )
+volume_db = -20.0
+autoplay = true
+
[connection signal="pressed" from="Control/VBoxContainer/StartButton" to="." method="_on_StartButton_pressed"]
[connection signal="pressed" from="Control/VBoxContainer/LeaderboardButton" to="." method="_on_LeaderboardButton_pressed"]
[connection signal="pressed" from="Control/VBoxContainer/HelpButton" to="." method="_on_HelpButton_pressed"]