This commit is contained in:
MarcEricMartel 2022-10-11 15:19:36 -04:00
parent 2add3e5349
commit 5fa68b94a2
6 changed files with 11 additions and 25 deletions

Binary file not shown.

View File

@ -1,23 +0,0 @@
[remap]
importer="wav"
type="AudioStreamSample"
path="res://.import/youspinmeround.wav-47f12562f8fd57a7d9a71fe0c8b5723f.sample"
[deps]
source_file="res://Audio/youspinmeround.wav"
dest_files=[ "res://.import/youspinmeround.wav-47f12562f8fd57a7d9a71fe0c8b5723f.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=0

View File

@ -140,6 +140,9 @@ margin_right = 1062.0
margin_bottom = 653.0 margin_bottom = 653.0
text = "Quit Game" text = "Quit Game"
[node name="MenuMusic" type="AudioStreamPlayer" parent="Start"]
bus = "Music"
[connection signal="pressed" from="Start/New Game" to="Start" method="_on_New_Game_pressed"] [connection signal="pressed" from="Start/New Game" to="Start" method="_on_New_Game_pressed"]
[connection signal="pressed" from="Start/Quit to Desktop" to="Start" method="_on_Quit_to_Desktop_Button_pressed"] [connection signal="pressed" from="Start/Quit to Desktop" to="Start" method="_on_Quit_to_Desktop_Button_pressed"]
[connection signal="pressed" from="Start/Quit Game" to="Start" method="_on_Quit_Game_pressed"] [connection signal="pressed" from="Start/Quit Game" to="Start" method="_on_Quit_Game_pressed"]

View File

@ -88,10 +88,8 @@ func _physics_process(delta):
if isSlap: if isSlap:
if slap >= slapkill: if slap >= slapkill:
AudioMegaSlap.translate(global_transform.origin)
AudioMegaSlap.play() AudioMegaSlap.play()
else: else:
AudioSlap.translate(global_transform.origin)
AudioSlap.play() AudioSlap.play()
if (chargeSlap): if (chargeSlap):

View File

@ -56,3 +56,8 @@ stream = ExtResource( 6 )
bus = "SFX" bus = "SFX"
emission_angle_enabled = true emission_angle_enabled = true
doppler_tracking = 2 doppler_tracking = 2
[node name="Music" type="AudioStreamPlayer" parent="."]
volume_db = 13.983
autoplay = true
bus = "Music"

View File

@ -4,8 +4,10 @@ var ingame = false
onready var NewGame = $"New Game" onready var NewGame = $"New Game"
onready var QuitGame = $"Quit Game" onready var QuitGame = $"Quit Game"
onready var QuitDesktop = $"Quit to Desktop" onready var QuitDesktop = $"Quit to Desktop"
onready var Music = $"MenuMusic"
func _ready(): func _ready():
Music.play()
self.show() self.show()
get_tree().paused = true get_tree().paused = true
QuitGame.hide() QuitGame.hide()
@ -21,6 +23,7 @@ func _on_New_Game_pressed():
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
get_tree().paused = false get_tree().paused = false
ingame = true ingame = true
Music.stop()
func openMenu(): func openMenu():
if (ingame): if (ingame):