From b6d9b308a49b35d9f8645e2f57f64a0716079c9b Mon Sep 17 00:00:00 2001
From: Ruslan Ignatov <ruslanlena30@gmail.com>
Date: Sat, 10 Jan 2026 19:29:30 +0300
Subject: [PATCH] Added gameplay music

---
 game/levels/abstract_level.gd     |  2 ++
 game/managers/settings_manager.gd |  2 +-
 game/managers/sound_manager.gd    |  3 +++
 game/managers/sound_manager.tscn  |  4 +++-
 sound/music/gameplay.wav          |  3 +++
 sound/music/gameplay.wav.import   | 24 ++++++++++++++++++++++++
 6 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 sound/music/gameplay.wav
 create mode 100644 sound/music/gameplay.wav.import

diff --git a/game/levels/abstract_level.gd b/game/levels/abstract_level.gd
index 10999c4..b16d68a 100644
--- a/game/levels/abstract_level.gd
+++ b/game/levels/abstract_level.gd
@@ -15,6 +15,8 @@ func _ready() -> void:
 	pause_menu.hide()
 	game_over_menu.hide()
 	
+	SoundManager.play_music_stream(SoundManager.music_stream_gameplay)
+	
 	if player_falling_at_start:
 		player.velocity.y = player.max_fall_speed
 
diff --git a/game/managers/settings_manager.gd b/game/managers/settings_manager.gd
index cd76ed7..f9a0c60 100644
--- a/game/managers/settings_manager.gd
+++ b/game/managers/settings_manager.gd
@@ -63,7 +63,7 @@ var sfx_volume : int:
 		_apply_audio_settings()
 		_save_settings()
 
-var _music_volume := 100
+var _music_volume := 50
 var music_volume : int:
 	get():
 		return _music_volume
diff --git a/game/managers/sound_manager.gd b/game/managers/sound_manager.gd
index 488f815..4fa6325 100644
--- a/game/managers/sound_manager.gd
+++ b/game/managers/sound_manager.gd
@@ -38,6 +38,7 @@ const MUSIC_BUS = "Music"
 @export var sfx_stream_switch : AudioStream
 
 @export_group("Music Streams", "music_stream")
+@export var music_stream_gameplay : AudioStream
 @export var music_stream_main_menu : AudioStream
 
 
@@ -70,6 +71,8 @@ func play_sfx_stream(stream: AudioStream, position: Vector2) -> AudioStreamPlaye
 
 
 func play_music_stream(stream: AudioStream) -> AudioStreamPlayer:
+	if _music_player.stream == stream: return
+	
 	_music_player.stream = stream
 	_music_player.play()
 	return _music_player
diff --git a/game/managers/sound_manager.tscn b/game/managers/sound_manager.tscn
index e77f844..e817958 100644
--- a/game/managers/sound_manager.tscn
+++ b/game/managers/sound_manager.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=18 format=3 uid="uid://drk4dvbn78dva"]
+[gd_scene load_steps=19 format=3 uid="uid://drk4dvbn78dva"]
 
 [ext_resource type="Script" uid="uid://cx5qcukr66whc" path="res://game/managers/sound_manager.gd" id="1_cg0sy"]
 [ext_resource type="AudioStream" uid="uid://d2suvaisb6w45" path="res://sound/ui/accept.wav" id="2_ge1il"]
@@ -17,6 +17,7 @@
 [ext_resource type="AudioStream" uid="uid://dy7qnen5k20mo" path="res://sound/sfx/player_spoted.wav" id="9_q7cyi"]
 [ext_resource type="AudioStream" uid="uid://dg0t7fwu8u3m2" path="res://sound/sfx/door_unlocking.wav" id="10_lqyhh"]
 [ext_resource type="AudioStream" uid="uid://ckmpft46wjgqs" path="res://sound/music/main_menu.wav" id="17_g6nb7"]
+[ext_resource type="AudioStream" uid="uid://ttemdy7avyh7" path="res://sound/music/gameplay.wav" id="17_l5yxe"]
 
 [node name="SoundManager" type="Node"]
 process_mode = 3
@@ -42,4 +43,5 @@ sfx_stream_level_completed = ExtResource("7_22ptj")
 sfx_stream_player_lost = ExtResource("8_6ll5c")
 sfx_stream_player_spoted = ExtResource("9_q7cyi")
 sfx_stream_switch = ExtResource("7_ab171")
+music_stream_gameplay = ExtResource("17_l5yxe")
 music_stream_main_menu = ExtResource("17_g6nb7")
diff --git a/sound/music/gameplay.wav b/sound/music/gameplay.wav
new file mode 100644
index 0000000..97408db
--- /dev/null
+++ b/sound/music/gameplay.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4da829eab5ebb67d96ca0a348898d3f196630185e8081a1ee4c4c193a124a06e
+size 33459832
diff --git a/sound/music/gameplay.wav.import b/sound/music/gameplay.wav.import
new file mode 100644
index 0000000..4a875d3
--- /dev/null
+++ b/sound/music/gameplay.wav.import
@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://ttemdy7avyh7"
+path="res://.godot/imported/gameplay.wav-f08007361da4b090c74e3abfcf5f980c.sample"
+
+[deps]
+
+source_file="res://sound/music/gameplay.wav"
+dest_files=["res://.godot/imported/gameplay.wav-f08007361da4b090c74e3abfcf5f980c.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2