feat: add background music by Abstraction

phibkro · Jul 23, 2024 · 52e8708 · 52e8708
1 parent 5c42c97
commit 52e8708
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 11 deletions.
diff --git a/assets/Three Red Hearts - Box Jump.ogg b/assets/Three Red Hearts - Box Jump.ogg
diff --git a/assets/Three Red Hearts - Box Jump.ogg.import b/assets/Three Red Hearts - Box Jump.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://r5qlf4177kcm"
+path="res://.godot/imported/Three Red Hearts - Box Jump.ogg-4145b5124c4cbba032ab1c5f18682143.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/Three Red Hearts - Box Jump.ogg"
+dest_files=["res://.godot/imported/Three Red Hearts - Box Jump.ogg-4145b5124c4cbba032ab1c5f18682143.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=0.0
+beat_count=0
+bar_beats=4
diff --git a/assets/confirm.wav → assets/sfx/confirm.wav b/assets/confirm.wav → assets/sfx/confirm.wav
diff --git a/assets/confirm.wav.import → assets/sfx/confirm.wav.import b/assets/confirm.wav.import → assets/sfx/confirm.wav.import
@@ -3,12 +3,12 @@
 importer="wav"
 type="AudioStreamWAV"
 uid="uid://c86lhi4x3wuyb"
-path="res://.godot/imported/confirm.wav-44b9323484d1ff24c35ee234bc7096b7.sample"
+path="res://.godot/imported/confirm.wav-77a79ad665f7e91913278e1f1b315796.sample"
 
 [deps]
 
-source_file="res://assets/confirm.wav"
-dest_files=["res://.godot/imported/confirm.wav-44b9323484d1ff24c35ee234bc7096b7.sample"]
+source_file="res://assets/sfx/confirm.wav"
+dest_files=["res://.godot/imported/confirm.wav-77a79ad665f7e91913278e1f1b315796.sample"]
 
 [params]
 

diff --git a/assets/Explosion.wav → assets/sfx/explosion.wav b/assets/Explosion.wav → assets/sfx/explosion.wav
diff --git a/assets/Explosion.wav.import → assets/sfx/explosion.wav.import b/assets/Explosion.wav.import → assets/sfx/explosion.wav.import
@@ -3,12 +3,12 @@
 importer="wav"
 type="AudioStreamWAV"
 uid="uid://03udbys7cv0p"
-path="res://.godot/imported/explosion.wav-de00f2d0ef23a85998326fdf0ffd33ab.sample"
+path="res://.godot/imported/explosion.wav-e1f35b1a1dc4bf25a23a1f22f1673be5.sample"
 
 [deps]
 
-source_file="res://assets/explosion.wav"
-dest_files=["res://.godot/imported/explosion.wav-de00f2d0ef23a85998326fdf0ffd33ab.sample"]
+source_file="res://assets/sfx/explosion.wav"
+dest_files=["res://.godot/imported/explosion.wav-e1f35b1a1dc4bf25a23a1f22f1673be5.sample"]
 
 [params]
 

diff --git a/src/hud.tscn b/src/hud.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="FontFile" uid="uid://d36ycqtk4abh6" path="res://assets/silver.ttf" id="1_2dp2q"]
 [ext_resource type="Script" path="res://src/hud.gd" id="1_8fgn7"]
-[ext_resource type="AudioStream" uid="uid://c86lhi4x3wuyb" path="res://assets/confirm.wav" id="3_je42j"]
+[ext_resource type="AudioStream" uid="uid://c86lhi4x3wuyb" path="res://assets/sfx/confirm.wav" id="3_je42j"]
 
 [sub_resource type="InputEventAction" id="InputEventAction_l2p0l"]
 action = &"start_game"

diff --git a/src/main.gd b/src/main.gd
@@ -13,6 +13,10 @@ extends Node
 	set(v):
 		sfx_game_over = v
 		update_configuration_warnings()
+@export var background_music: AudioStreamPlayer:
+	set(v):
+		background_music = v
+		update_configuration_warnings()
 var score: int
 
 func _get_configuration_warnings():
@@ -28,9 +32,10 @@ func _get_configuration_warnings():
 func new_game():
 	# Reset
 	score = 0
-	$Player.start($StartPosition.position)
+	player.start($StartPosition.position)
 	get_tree().call_group("mobs", "queue_free")
 	$StartTimer.start()
+	background_music.play()
 
 	# Update hud
 	$HUD.update_score(score)
@@ -64,6 +69,7 @@ func _on_mob_timer_timeout():
 	add_child(mob)
 
 func game_over():
+	background_music.stop()
 	sfx_game_over.play()
 	$ScoreTimer.stop()
 	$MobTimer.stop()

diff --git a/src/main.tscn b/src/main.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=10 format=3 uid="uid://t6k0gfwo2y5b"]
+[gd_scene load_steps=11 format=3 uid="uid://t6k0gfwo2y5b"]
 
 [ext_resource type="PackedScene" uid="uid://dpo75j7ra04cm" path="res://src/characters/player.tscn" id="1_1ufet"]
 [ext_resource type="Script" path="res://src/main.gd" id="1_180hn"]
@@ -7,19 +7,21 @@
 [ext_resource type="PackedScene" uid="uid://n4ny5ub0c0bg" path="res://src/hud.tscn" id="4_2dwxb"]
 [ext_resource type="TileSet" uid="uid://qf2hqmh4hx0b" path="res://assets/terrain/grass_flat.tres" id="5_52nv5"]
 [ext_resource type="SpriteFrames" uid="uid://cxn20r5ped3i5" path="res://assets/troops/sheep/sheep.tres" id="6_n0bua"]
-[ext_resource type="AudioStream" uid="uid://03udbys7cv0p" path="res://assets/explosion.wav" id="7_uckn2"]
+[ext_resource type="AudioStream" uid="uid://03udbys7cv0p" path="res://assets/sfx/explosion.wav" id="7_uckn2"]
+[ext_resource type="AudioStream" uid="uid://r5qlf4177kcm" path="res://assets/Three Red Hearts - Box Jump.ogg" id="9_37vov"]
 
 [sub_resource type="Curve2D" id="Curve2D_4qfgg"]
 _data = {
 "points": PackedVector2Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 480, 0, 0, 0, 0, 0, 480, 720, 0, 0, 0, 0, 0, 720, 0, 0, 0, 0, 0, 0)
 }
 point_count = 5
 
-[node name="Main" type="Node" node_paths=PackedStringArray("player", "sfx_game_over")]
+[node name="Main" type="Node" node_paths=PackedStringArray("player", "sfx_game_over", "background_music")]
 script = ExtResource("1_180hn")
 player = NodePath("Player")
 mob_scene = ExtResource("2_dncjg")
 sfx_game_over = NodePath("Death")
+background_music = NodePath("BGMusic")
 
 [node name="BGColor" type="TextureRect" parent="."]
 anchors_preset = 15
@@ -73,6 +75,10 @@ curve = SubResource("Curve2D_4qfgg")
 stream = ExtResource("7_uckn2")
 volume_db = -15.022
 
+[node name="BGMusic" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("9_37vov")
+volume_db = -30.77
+
 [connection signal="hit" from="Player" to="." method="game_over"]
 [connection signal="timeout" from="MobTimer" to="." method="_on_mob_timer_timeout"]
 [connection signal="timeout" from="ScoreTimer" to="." method="_on_score_timer_timeout"]