From f3192c9b302de2879dc904e9462bc2391842eb9d Mon Sep 17 00:00:00 2001 From: Conrad Date: Sat, 18 Apr 2020 19:30:43 +0200 Subject: [PATCH] Added sounds to titlescreen --- src/Menus/Sounds/menu_focus_change.ogg | Bin 0 -> 5266 bytes src/Menus/Sounds/menu_focus_change.ogg.import | 15 +++++++++++++ src/Menus/Sounds/menu_option_select.ogg | Bin 0 -> 4964 bytes .../Sounds/menu_option_select.ogg.import | 15 +++++++++++++ src/Menus/TitleScreen/TitleScreen.gd | 1 + src/Menus/TitleScreen/TitleScreen.tscn | 21 ++++++++++-------- src/Menus/TitleScreen/TitleScreenButton.gd | 17 ++++++++++++++ src/Menus/TitleScreen/TitleScreenButton.tscn | 15 ++++++++++++- 8 files changed, 74 insertions(+), 10 deletions(-) create mode 100644 src/Menus/Sounds/menu_focus_change.ogg create mode 100644 src/Menus/Sounds/menu_focus_change.ogg.import create mode 100644 src/Menus/Sounds/menu_option_select.ogg create mode 100644 src/Menus/Sounds/menu_option_select.ogg.import diff --git a/src/Menus/Sounds/menu_focus_change.ogg b/src/Menus/Sounds/menu_focus_change.ogg new file mode 100644 index 0000000000000000000000000000000000000000..93b177be3a487950a8d8a9b2388512daffac252a GIT binary patch literal 5266 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 literal 0 HcmV?d00001 diff --git a/src/Menus/Sounds/menu_focus_change.ogg.import b/src/Menus/Sounds/menu_focus_change.ogg.import new file mode 100644 index 0000000..5772770 --- /dev/null +++ b/src/Menus/Sounds/menu_focus_change.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/menu_focus_change.ogg-b255a32b3968213712292d0ecbc5df1e.oggstr" + +[deps] + +source_file="res://Menus/Sounds/menu_focus_change.ogg" +dest_files=[ "res://.import/menu_focus_change.ogg-b255a32b3968213712292d0ecbc5df1e.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/src/Menus/Sounds/menu_option_select.ogg b/src/Menus/Sounds/menu_option_select.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e64c4e70e54f699fe4dac19e5ac50f76b8f79411 GIT binary patch literal 4964 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 literal 0 HcmV?d00001 diff --git a/src/Menus/Sounds/menu_option_select.ogg.import b/src/Menus/Sounds/menu_option_select.ogg.import new file mode 100644 index 0000000..3244f2d --- /dev/null +++ b/src/Menus/Sounds/menu_option_select.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/menu_option_select.ogg-f8ab7921ff48f27e306fb00e7fdd9726.oggstr" + +[deps] + +source_file="res://Menus/Sounds/menu_option_select.ogg" +dest_files=[ "res://.import/menu_option_select.ogg-f8ab7921ff48f27e306fb00e7fdd9726.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/src/Menus/TitleScreen/TitleScreen.gd b/src/Menus/TitleScreen/TitleScreen.gd index af2172f..f2974f0 100644 --- a/src/Menus/TitleScreen/TitleScreen.gd +++ b/src/Menus/TitleScreen/TitleScreen.gd @@ -8,5 +8,6 @@ func _ready(): animation_player.play("__INIT__") func _on_Startup_startup_finished(): + new_game_button.ignore_once = true # Pauls russian solution for ignoring the first sound click in the titlescreen new_game_button.grab_focus() animation_player.play("show_buttons") diff --git a/src/Menus/TitleScreen/TitleScreen.tscn b/src/Menus/TitleScreen/TitleScreen.tscn index e1c661d..b515fd4 100644 --- a/src/Menus/TitleScreen/TitleScreen.tscn +++ b/src/Menus/TitleScreen/TitleScreen.tscn @@ -160,20 +160,23 @@ anchor_left = -0.00168862 anchor_top = -0.003002 anchor_right = 0.998311 anchor_bottom = 0.996998 -margin_left = 0.875977 -margin_right = 0.875977 +margin_left = 0.810538 +margin_top = -0.18946 +margin_right = -141.189 +margin_bottom = -89.1895 script = ExtResource( 3 ) __meta__ = { "_edit_use_anchors_": false } [node name="Startup" parent="." instance=ExtResource( 2 )] +scale = Vector2( 1.50376, 1.50079 ) [node name="VBoxContainer" type="VBoxContainer" parent="."] -anchor_left = 0.623951 -anchor_top = 0.056 -anchor_right = 0.970827 -anchor_bottom = 0.469669 +anchor_left = 0.619068 +anchor_top = 1.05219 +anchor_right = 0.965944 +anchor_bottom = 1.46586 margin_left = 1.52588e-05 __meta__ = { "_edit_group_": true, @@ -181,7 +184,7 @@ __meta__ = { } [node name="NewGameButton" parent="VBoxContainer" instance=ExtResource( 1 )] -margin_right = 166.0 +margin_right = 117.0 scene_to_load = "res://World.tscn" [node name="Label" parent="VBoxContainer/NewGameButton" index="0"] @@ -189,7 +192,7 @@ text = "New Game" [node name="CreditsButton" parent="VBoxContainer" instance=ExtResource( 1 )] margin_top = 24.0 -margin_right = 166.0 +margin_right = 117.0 margin_bottom = 44.0 scene_to_load = "res://Menus/Credits/Credits.tscn" @@ -198,7 +201,7 @@ text = "Credits" [node name="QuitButton" parent="VBoxContainer" instance=ExtResource( 1 )] margin_top = 48.0 -margin_right = 166.0 +margin_right = 117.0 margin_bottom = 68.0 quit = true diff --git a/src/Menus/TitleScreen/TitleScreenButton.gd b/src/Menus/TitleScreen/TitleScreenButton.gd index b27dd80..97295ac 100644 --- a/src/Menus/TitleScreen/TitleScreenButton.gd +++ b/src/Menus/TitleScreen/TitleScreenButton.gd @@ -3,10 +3,27 @@ class_name TitleSceenButton export(String, FILE, "*.tscn,*.scn") var scene_to_load = "" export(bool) var quit = false +onready var sound_focus = $Sounds/FocusChange +onready var sound_select = $Sounds/OptionSelect +var ignore_once = false func _pressed(): + sound_select.play() + + +func _on_OptionSelect_finished(): if quit: get_tree().quit() return get_tree().change_scene(scene_to_load) + + +func _on_TitleScreenButton_mouse_entered(): + grab_focus() + + +func _on_TitleScreenButton_focus_entered(): + if not ignore_once: + sound_focus.play() + ignore_once = false diff --git a/src/Menus/TitleScreen/TitleScreenButton.tscn b/src/Menus/TitleScreen/TitleScreenButton.tscn index b41d6c6..97c34a6 100644 --- a/src/Menus/TitleScreen/TitleScreenButton.tscn +++ b/src/Menus/TitleScreen/TitleScreenButton.tscn @@ -1,7 +1,9 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://Fonts/Harmonic/Harmonic24.tres" type="DynamicFont" id=1] [ext_resource path="res://Menus/TitleScreen/TitleScreenButton.gd" type="Script" id=2] +[ext_resource path="res://Menus/Sounds/menu_focus_change.ogg" type="AudioStream" id=3] +[ext_resource path="res://Menus/Sounds/menu_option_select.ogg" type="AudioStream" id=4] [node name="TitleScreenButton" type="Button"] margin_right = 110.0 @@ -19,3 +21,14 @@ __meta__ = { "_edit_use_anchors_": false, "_editor_description_": "" } + +[node name="Sounds" type="Node" parent="."] + +[node name="FocusChange" type="AudioStreamPlayer" parent="Sounds"] +stream = ExtResource( 3 ) + +[node name="OptionSelect" type="AudioStreamPlayer" parent="Sounds"] +stream = ExtResource( 4 ) +[connection signal="focus_entered" from="." to="." method="_on_TitleScreenButton_focus_entered"] +[connection signal="mouse_entered" from="." to="." method="_on_TitleScreenButton_mouse_entered"] +[connection signal="finished" from="Sounds/OptionSelect" to="." method="_on_OptionSelect_finished"]