Add music

fiwon123 · Oct 21, 2019 · 05e179f · 05e179f
1 parent 889fe92
commit 05e179f
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 4 deletions.
diff --git a/MetroidvaniaTCC/SFX/BRPG_Vanquisher_FULL_Loop.wav b/MetroidvaniaTCC/SFX/BRPG_Vanquisher_FULL_Loop.wav
diff --git a/MetroidvaniaTCC/SFX/BRPG_Vanquisher_FULL_Loop.wav.import b/MetroidvaniaTCC/SFX/BRPG_Vanquisher_FULL_Loop.wav.import
@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/BRPG_Vanquisher_FULL_Loop.wav-4bc8580d2b0674a5db22513d7e652c27.sample"
+
+[deps]
+
+source_file="res://SFX/BRPG_Vanquisher_FULL_Loop.wav"
+dest_files=[ "res://.import/BRPG_Vanquisher_FULL_Loop.wav-4bc8580d2b0674a5db22513d7e652c27.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=true
+edit/normalize=true
+edit/loop=true
+compress/mode=0
diff --git a/MetroidvaniaTCC/Scenes/GUI/PanelMenu.gd b/MetroidvaniaTCC/Scenes/GUI/PanelMenu.gd
@@ -11,5 +11,7 @@ func _on_ButtonResume_button_down():
 
 
 func _on_ButtonExit_button_down():
-	get_tree().change_scene("res://Scenes/Screens/MainMenu.tscn")
 	get_tree().paused = false
+	Global.music.stop()
+	get_tree().change_scene("res://Scenes/Screens/MainMenu.tscn")
+
diff --git a/MetroidvaniaTCC/Scenes/Global/Global.tscn b/MetroidvaniaTCC/Scenes/Global/Global.tscn
@@ -1,9 +1,12 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://Scripts/Global.gd" type="Script" id=1]
+[ext_resource path="res://SFX/BRPG_Vanquisher_FULL_Loop.wav" type="AudioStream" id=2]
 
 [node name="Global" type="Node"]
 script = ExtResource( 1 )
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 2 )
+volume_db = -5.0
 
diff --git a/MetroidvaniaTCC/Scenes/Levels/Level1.tscn b/MetroidvaniaTCC/Scenes/Levels/Level1.tscn
@@ -1249,7 +1249,7 @@ x = 2
 
 [node name="Sprite" parent="Barreiras/Barreira3" index="5"]
 modulate = Color( 0.996078, 0.501961, 1, 1 )
-frame = 0
+frame = 2
 
 [node name="Barreira4" parent="Barreiras" instance=ExtResource( 22 )]
 editor/display_folded = true
@@ -1259,7 +1259,7 @@ x = 3
 
 [node name="Sprite" parent="Barreiras/Barreira4" index="5"]
 modulate = Color( 0.996078, 0.501961, 1, 1 )
-frame = 0
+frame = 2
 
 [node name="ObjectsVila" type="Node2D" parent="."]
 editor/display_folded = true

diff --git a/MetroidvaniaTCC/Scripts/Game.gd b/MetroidvaniaTCC/Scripts/Game.gd
@@ -9,6 +9,9 @@ onready var anim_cutscene = $AnimationCutScenes
 
 func _ready():
 	Global.game = self
+
+	if (Global.is_trigger1 == true):
+		Global.music.play()
 
 func pause_animation():
 	$AnimationCutScenes.playback_process_mode = AnimationPlayer.ANIMATION_PROCESS_MANUAL
@@ -41,4 +44,7 @@ func showTutorialJump():
 	pass
 
 func _on_AnimationCutScenes_animation_finished(anim_name):
+	if (anim_name == "cena1"):
+		Global.music.play()
+
 	is_stop = false
diff --git a/MetroidvaniaTCC/Scripts/Global.gd b/MetroidvaniaTCC/Scripts/Global.gd
@@ -1,5 +1,7 @@
 extends Node
 
+onready var music = $AudioStreamPlayer
+
 var dialogue
 var GUI
 var Camera2D