From f3192c9b302de2879dc904e9462bc2391842eb9d Mon Sep 17 00:00:00 2001 From: Conrad Date: Sat, 18 Apr 2020 19:30:43 +0200 Subject: [PATCH 1/3] 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"] From 4564dbdab4113177cbc6fef1818070959793c1ce Mon Sep 17 00:00:00 2001 From: Conrad Date: Sat, 18 Apr 2020 20:11:00 +0200 Subject: [PATCH 2/3] Added walk sounds for the player --- src/Player/Player.gd | 29 +++++++++++++++++++++-- src/Player/Player.tscn | 26 +++++++++++++++++++- src/Player/Sounds/hero_walk_1.ogg | Bin 0 -> 5684 bytes src/Player/Sounds/hero_walk_1.ogg.import | 15 ++++++++++++ src/Player/Sounds/hero_walk_2.ogg | Bin 0 -> 6245 bytes src/Player/Sounds/hero_walk_2.ogg.import | 15 ++++++++++++ src/Player/Sounds/hero_walk_3.ogg | Bin 0 -> 5497 bytes src/Player/Sounds/hero_walk_3.ogg.import | 15 ++++++++++++ src/Player/Sounds/hero_walk_4.ogg | Bin 0 -> 6200 bytes src/Player/Sounds/hero_walk_4.ogg.import | 15 ++++++++++++ src/Player/Sounds/hero_walk_5.ogg | Bin 0 -> 5821 bytes src/Player/Sounds/hero_walk_5.ogg.import | 15 ++++++++++++ 12 files changed, 127 insertions(+), 3 deletions(-) create mode 100644 src/Player/Sounds/hero_walk_1.ogg create mode 100644 src/Player/Sounds/hero_walk_1.ogg.import create mode 100644 src/Player/Sounds/hero_walk_2.ogg create mode 100644 src/Player/Sounds/hero_walk_2.ogg.import create mode 100644 src/Player/Sounds/hero_walk_3.ogg create mode 100644 src/Player/Sounds/hero_walk_3.ogg.import create mode 100644 src/Player/Sounds/hero_walk_4.ogg create mode 100644 src/Player/Sounds/hero_walk_4.ogg.import create mode 100644 src/Player/Sounds/hero_walk_5.ogg create mode 100644 src/Player/Sounds/hero_walk_5.ogg.import diff --git a/src/Player/Player.gd b/src/Player/Player.gd index 70031c6..52db787 100644 --- a/src/Player/Player.gd +++ b/src/Player/Player.gd @@ -5,18 +5,25 @@ This is an example player controller script created by Paul """ var velocity := Vector2.ZERO var rollvector := Vector2.ZERO + # This is how you export variables with ranges to the editor window export(int, 0, 500) var ROLL_SPEED := 150 export(int, 0, 500) var FRICTION := 200 # Speed at which the player deaccelarates export(int, 0, 500) var ACCELERATION := 450 -# Reference for the current player +# Reference for the current player onready var player_stats := $Stats onready var debug_label := $DebugLabel onready var animation_player := $AnimationPlayer onready var animation_tree := $AnimationTree onready var animation_state = animation_tree.get("parameters/playback") +# Variables for sound selection +onready var walk_sounds = $Sounds/Walk +var _rng = RandomNumberGenerator.new() +var is_playing_sound = false + + enum moveState{ MOVE, ROLL, @@ -81,8 +88,9 @@ func movement_move(delta): animation_tree.set("parameters/hit/blend_position", input_vector) animation_tree.set("parameters/roll/blend_position", input_vector) animation_tree.set("parameters/run/blend_position", input_vector) - animation_state.travel("run") + animation_state.travel("run") velocity = velocity.move_toward(player_stats.speed * input_vector, ACCELERATION * delta) + _play_random_sound(walk_sounds) if Input.is_action_just_pressed("roll"): movementState = moveState.ROLL elif Input.is_action_just_pressed("attack"): @@ -120,3 +128,20 @@ func _on_Hitbox_area_entered(area): currency += area.currency_value player_stats.health = player_stats.health+area.health_value player_stats.speed -= area.slowdown_value + + +func _walk_sound_finished(): + is_playing_sound = false + + +func _play_random_sound(path = walk_sounds): + if not is_playing_sound: + var sound = path.get_children()[_rng.randi_range(0, path.get_child_count() - 1)] + sound.play() + is_playing_sound = true + + +# Overrides ready method for this entire script, checks for the finished method of each possible sound +func _ready(): + for child in walk_sounds.get_children(): + child.connect("finished", self, "_walk_sound_finished") diff --git a/src/Player/Player.tscn b/src/Player/Player.tscn index 5c33152..de30fbb 100644 --- a/src/Player/Player.tscn +++ b/src/Player/Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=56 format=2] +[gd_scene load_steps=61 format=2] [ext_resource path="res://Player/Player.gd" type="Script" id=1] [ext_resource path="res://Player/Player.png" type="Texture" id=2] @@ -6,6 +6,11 @@ [ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=4] [ext_resource path="res://Overlap/Stats/Stats.tscn" type="PackedScene" id=5] [ext_resource path="res://Fonts/Harmonic/Harmonic.ttf" type="DynamicFontData" id=6] +[ext_resource path="res://Player/Sounds/hero_walk_3.ogg" type="AudioStream" id=7] +[ext_resource path="res://Player/Sounds/hero_walk_5.ogg" type="AudioStream" id=8] +[ext_resource path="res://Player/Sounds/hero_walk_4.ogg" type="AudioStream" id=9] +[ext_resource path="res://Player/Sounds/hero_walk_2.ogg" type="AudioStream" id=10] +[ext_resource path="res://Player/Sounds/hero_walk_1.ogg" type="AudioStream" id=11] [sub_resource type="CapsuleShape2D" id=1] radius = 2.15976 @@ -707,6 +712,25 @@ __meta__ = { [node name="Stats" parent="." instance=ExtResource( 5 )] max_health = 5 + +[node name="Sounds" type="Node" parent="."] + +[node name="Walk" type="Node" parent="Sounds"] + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="Sounds/Walk"] +stream = ExtResource( 11 ) + +[node name="AudioStreamPlayer2" type="AudioStreamPlayer" parent="Sounds/Walk"] +stream = ExtResource( 10 ) + +[node name="AudioStreamPlayer3" type="AudioStreamPlayer" parent="Sounds/Walk"] +stream = ExtResource( 7 ) + +[node name="AudioStreamPlayer4" type="AudioStreamPlayer" parent="Sounds/Walk"] +stream = ExtResource( 9 ) + +[node name="AudioStreamPlayer5" type="AudioStreamPlayer" parent="Sounds/Walk"] +stream = ExtResource( 8 ) [connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"] [connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"] [connection signal="area_exited" from="Hurtbox" to="." method="_on_Hurtbox_area_exited"] diff --git a/src/Player/Sounds/hero_walk_1.ogg b/src/Player/Sounds/hero_walk_1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..2d99d1481c7c13264a067086469efa76f2fe211a GIT binary patch literal 5684 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 Fe*(2PO_%@x literal 0 HcmV?d00001 diff --git a/src/Player/Sounds/hero_walk_1.ogg.import b/src/Player/Sounds/hero_walk_1.ogg.import new file mode 100644 index 0000000..9d3c198 --- /dev/null +++ b/src/Player/Sounds/hero_walk_1.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/hero_walk_1.ogg-189348d983150ee57f2f6f423ab41c11.oggstr" + +[deps] + +source_file="res://Player/Sounds/hero_walk_1.ogg" +dest_files=[ "res://.import/hero_walk_1.ogg-189348d983150ee57f2f6f423ab41c11.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/src/Player/Sounds/hero_walk_2.ogg b/src/Player/Sounds/hero_walk_2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..ad20e8dd7943dfa87aac8c12532515d756b63220 GIT binary patch literal 6245 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 YIR{)@#&@n8PT#cAtC!oUVBV?lFX3NIXaE2J literal 0 HcmV?d00001 diff --git a/src/Player/Sounds/hero_walk_2.ogg.import b/src/Player/Sounds/hero_walk_2.ogg.import new file mode 100644 index 0000000..7b5df15 --- /dev/null +++ b/src/Player/Sounds/hero_walk_2.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/hero_walk_2.ogg-e1d0be2a03d2db5f284fb29ec53c5da6.oggstr" + +[deps] + +source_file="res://Player/Sounds/hero_walk_2.ogg" +dest_files=[ "res://.import/hero_walk_2.ogg-e1d0be2a03d2db5f284fb29ec53c5da6.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/src/Player/Sounds/hero_walk_3.ogg b/src/Player/Sounds/hero_walk_3.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e08b1f8f8880bc91855630dc36f525c17492e83f GIT binary patch literal 5497 zcmeG=dsNd$))Np&5RpfCHqrz^5)6I>A|J5OhF}l^K?#Wh8kI+o5L6(*N>@+A(+~kM z29}q6yb?(OD+pBlzP6wS6a;yLwe_v|p!;EMi>dv_ujep zH}^63PPXjb8wvElay!b^O_~a+yHF0OtOMzB0uchz+tjv9lBOd*huVVdeAAGfD7b1M z((YLN?&o*faeW=D^^hV;keak%OZr}XiXd*ARscQ(@8M4IaQATc#1psd+b>8>=ZpCJ zGe`(`l!0z5i5|EO1<(*e3Bzl|V`WgF8322nNTw$eLr4mF12MZ&9*oR1?nRaIB8_c) zF=gQOfTt!{0k8syiI~!+hat(MK6`ClO4I9o1mWJN@J7;z+dh~J->-|`uk2C^_m7gC z(W{~j;JE=Um{5RaBSV~oP-qK>Be?X-gj2QY#;z^(xyBxs@p)k$kDE_~`#x@ID)oIr z>>8u5bnBX6hEb-s#h?DnkatKl>N8)vJYclvz{78$8`>q9(a{Kd2}xO*4q54rg$H7I zOtASlHlzbP+<_YzciQqTIl^+|xF;i$!{Wl0$=jaApUujg%{m-iS+L{W;plS(JLU>_ zO9ipEh0FcL;af{c*B%{@0`+TsD(;aQ9qk+M`ZVh27q;nv1VklxjLeZFYYI^&CZ876 z^dz>KVR4|keqNuX6%AYTLO1=Y%b=!wx4{9o_1q|2^=26Z`@h8s+CVz8YC)5%6! z4POS(rZhHLlTO_%q7I7uVBegv>54pT}Yr&LJyL-@tKYX3BX zL16E?4-MKacFuO-WG?=2sbL(Jpd_4d$T((tqMmY@)a+1F8pKrPZDrfJC^B-jC&vSj zZ>II)*MruTbza;ole!KO&tCNyCL=@J#Zlj-sDF9B$q#(#lPOe-|^|; z=$_?((S^;e+03^h2MG~JpVE85vK4=eoO)vEUGLJhAu^|E*}CkCy+zfks=CLjM&oxP zCrNs$QhG`votKmniz);~)#~2Hl%dm4&;M$F6FHmHonVKN!$@~}D{}fMxIh?9on+Q? z-5LGIp+YklHg6jMfW9)5Q0+Yu!FHQwZ=7bkaXJ3~JYpbrn#!7_LdBK?U#xR3Anj(n2Ny3yT`DM3M(=edAP`r9aJ*pCu`8h|d2 zGKD{DdIMp-p4b}&j@+Zk@F9y-aeVZm-$DB@%iB@beygjECSOMfOt9Zl4?6g*R$|Ji ztLu!ew1qG5dzEaRhqm>*qd1b~d6?eNQN{&na(0#RZj07n|5tW$BrdZqEv zG#Pp2o@l_*KWI}cAMZs~%ojBhtCi~W8=#Z((>F^K7ag79kwe z>eDMB}HOwS5E#Y(~&qjj4)G)i~Aw*o>Y&l;nfcws$ChK!_YrA^2 z`pNmz>xTg>psttmqYZB(t4=ZixBE~4--q_S($a~3k9BSlVC_2{fdu+OaV(RfFp0OI z8#ly;(Sr#IY_=;&VN7>*E@uY>E1KCJOgBXZ+kj9mW2*4YY&OXNh}U?-Ulh8aux$nS z7FK)l^0=!$^G_%Q{ZyL2Dq2avnx(q*AMm;c5~pssO2X)#|4gdJz53X2#w?l>hX6AJls$-|ife zzR4>A*pdo>>zUZh{1c5GeK67KA^9?&f+oS5%aG7)Mh_+xl>NQ?qr`BJ*lhWQ;#C~G zJWDfv`_=Nd_shR?HWwpo@7@M%M+@|6(fK8wZB8exN)2u7J1qbj1Faq)p*(Vu%a}|n zda)1Dxx6Aq+D?~H(2C}%m=ucjH6NpfW_gU1)N>aa2*Th|Vs@@1DC99m-Fj?mQV7s$ zLI{iZWOhRsJc^La?1iunjjgbRL9E$lZh+narZAH+{@cGC~tQoCE1i@!csW9gOthm4nZc!Q)FBj55CrN#h#;@%j)uZ`d*3N^xw)ACUTu9O=LrqU0l)#=hS%41;ON*`b??#Q z3xF}VBakRQ0p?ot@4yQHg4tq;BYd>$5erRh&a;rLmYR}k&J^nm#9bVxiTq+5E`G+HmOQh+Wg!ZZrZG@{{y_~_b zFQ~UMu;%7x{JTD%jCB z>+6YUbAPB`!#$N6Mt*S9O>)N*bLP*VfAq8UGvgPGqdZyb=aO=Yauh)wjBdkrVvlL7eOIo5 zkU=)SyMOJMceb>;M;!Z*KOroy(2(v!W*Go1Jgv{NdK6SQpLKuX^7CA$3aLwm>a3+? z|3UVEes;rL=g;>o-`{o9Vh4H7u`wXYZQ&tx_fSzhqtNS-%b}6qm!=*N9oi+teDYNh zrl0U*`2WxUX{UmX`iXx0N7J&vs_$K0=Sx+`t{%1PyN248gnPNWAboM`RYPV&+QP?H zL;Zo2_lUE4JseZha2rd@wd<_o6XO!0S)gYm&sELY_WWQybw(4nvei1dsUS17qhBo$ zOuKr;bg1L(3o|3ET3f8RxE64pf+o=a{8vj#Zh+#1-qj^PLNmPCD|B8W?f{HIpZY5jFupGSNr%&#GWYUA2P@8 zn+;@H4Yvn6&i^PKkgpWCCsTV+^$&KpPqaDRc+xWCcc5GP1@5{7zpsoG)3||Iy8VmZ z)V#AJLuMwuH$L2L@cu&RU7OIcxyBj;GXHMiQ0KPZ>BFl^PkxvCP4l6j>O)_BSDf;J zh(Hot39Vg-a>Mat*7|*TU=Rr$5^+y=2+wyuUKqooJxjlD-^jb3k(Fe;^Sj(0=&Vsv z+YltEkv0|A+Ee%$_fl8K*-yDbuNw(ma!ObKdBV1RXRb@oMF@xi z5kf*)Em*;&t)j9C$RZ$Mt0IbMwXJoj`a1KR`%BRJ`ua`Z_w{@K&HZlfckVgo-t#-# zz2_!)=gu&I2CHo$TnUH-yn`qU)UFS+R#utbE&$l_)s7C;T|T z!2R{F+94I?RvRHlWO8QGrr_+IgtX-N2!#NGKf%e7?BwX==uEH+PR~fr%;x3rGIEK? z?kF|oQX<_e0tGM-Lk=Vi@F&ZmKs^9rt%Q)C$g&qX>Ep&C`L_InN*V%}V@JEqu1r}6KOu!0x=cAU!q`FKu;s;U-^H8Tl{dF*AE!nTb$TD?v><9;5c5J1 zhc8_1FZbPgfpmrH1QcjkPp!T~lviL2Q+BQp)9kZENceKdMKNup|J2U zfIg+MNCVjv-yF(NjtA_%x!#w>fmfadu6^SK#O(mk$YujsW|yHgSPs+KF57dq%;f~l zK~o?W`S&ef5id{?%cDE0Q}`I?@;HTA_;6c%BgRWdDG4$N8}AY%lai-bsJfEnhE{Ct z^aT;S*7i(mO|8O%Y2(Ispf8CdM+O>>OiFUb{dFXACA7z&R-?1^D#RJD)aecy$3ed2 zs}haYg-E!TGby>(as~?_k+{~j=L}o9-)dO2{-tjG0`)drA-Z0hdPXw_La!3*zQ3Z0 z;C>xGH0ZaudHmqf{e*pG>hW01X3I*8+)s2X8_2^%nMG-t53}_^2+P=3p1WV6IRStI zJw+7185E(cjAB_uk^P9>=VMNzBxLBgH177W>yng?W^@P6p)H{9RN3&1^8`!6u9KxKp zgtNo9?@H$!&ine5AZ9-A*4(~ZbEO}wEBtj}z0Di|lcqqClj8Ui@=)D@ZFEhggWqIM z7Ix^6+2upl0Vk}3u9B`ip#(prOc^plDM4Ylm?>P|v=J|CbIi00Z#tYeyNkEb%Zoa- zkJG!FFv_&KHJA5J<{&9zMJ>DISE2e#<}}!qExDGh_ph+#RBYH&y;CG(dE@R!h4gjF9Tqi(rj)bxtW?3$?EQfIRmVciykUC2Vnx;U*RsmoPz+GAM z%wKg4;>)Qb&m@e0zu7>v+k?8M=#qow>wWycvkV*4Q|+ml^cP@fmbfYAIqc%n&O|>? zhu%S!<#LM#JoYf4(HQ6sq0E9*%mP$k<{{008U$fcR}7KM1Gc^?3e9i}&5)s-{;?4X zqJ*l#zPb$*G{r_uQC4L^DSgfi8U@}Yf4u#MtWXzJ@H?_-lpq>A=#NYK&kp~w!0%cB zhB!(W{*362mK)K0R}?sShgL!Ge@x*ga2|W?HVHIbj5P9CE76#KlO6DaeL~r7;jy+^ zvz)TFUSr}w^4r1?5cWVqJ!JMn2rC!f#5Meo$AN~;no|WSXpiZFfM5;!Zo5`5?~&RS z!TPCfB#Siq)H@U#6c!$H_)cW?ib!fFX>L2a2@0A}Tv4#NOOm`rQ-ZMY6o#j9%sRMnK=_i-5oR|*sYL=R1RRyz^AY-wJYJhL<3V)Fp zL1Bj~cmk`v1abTrb;X*_B;TvcF|d^5VR_SvO+acKaRnLH$=jHhYaq^6o(TEsDp_t2 zrwa>?T*x95v*`Eha$x;&6tbWIO=<0-v~7+CY=yaTpl=azSG_GXw|_{A@_=FDf3b)eW;!BG#2gsZXV_|(_Y3m>t2974Lq|{+noHMQlXj@zX z%?9sjYaDJA*QB}5g0FDQ8Tf{Tp*M&`7!p@389oPw8KD4qiODbuf+s95q0fvH-VhoK zDp(_M1ww%0Y~(Y_6?RA^%xry2kc-7E#afJ_M21gMq*672u`6c5bpj|uSvy06Xh9hY z0uw%2v2;x(L0kd(*bsOUQx zVz9LQd>!CQ^D9RKEo~k1OAH!qlVww1LuR0>?a|EucnZh#M8W|AxzWVVzFCDopjNmS z3{TGceQ}zmcj3X|@+x_NA+(Y<~An1S0u;PHl1+=MiM!eEpS zPGpY3DE{bB^~wA=SJ`px=<=KVDTLeUXU zi9b9=x?8$^IvJgwp{7yA$=#ou^hTIIV$WhtKb{$PoZS{4>M}c?vQb@~{?+rNqd2a< zJ}yCL(%ber_sW4y9;IX79Nuk}$xl>?HLt#Wb&cspmWTKJE6wDL+Myv^?bu4MZQrbE z#G!L)9^Le8r9V1e+wn#H%=n3!)cS~Wr%sLDD4bO0w4{1IsTVLX>7LQ~?@c$}6W#K8 zvTu8GfT#O6r0J<6UNkC6KRDp~t|;>xOXqvMJsi$l%E-$tetj(;NQTLSK&=yTuvueI`KzQ$n)!D``~nu|X6s-36oR zR6+(VMMcYn9B|Yqgnjd;7o6!Iy^rmFe*1}YAZ{Y|8&l%e+^5Hae*xbMDNV_rsYob6 z>2*htef(3<_w^hHc~V`VQJy;^fDLQV|_mcz3d zNTt{Cp~R!~V^{xnDu#IJ^>Xm^-;39;fJEF>;@b9C(f9k@>D&&rVLK->^>k`QwbPr2a|MJlRAp>aO{6T7mqZdXnbL?jsABfS)ZXK{>Q^ z4m+`iKrKY^;TKllI2#hu!N9d+xZzq4+HsziA zV=qD4@`ucJpYu3kx2mx*h$ueF4fOKvvEml*H)62I4{tQ-W=wMRQH;q}G}rgsi91gU z99_WPtuM@L$gg##S8{IU8$X?JyphsFV)iZ9{X!n5!hV9eRfxPQ2H^(to{Bo zPcp(c;!m1fEOQqO0B+Kw?7(6DB0fFga00z7M0IcCwJ6)RDsEmeyRzsku4qguw%q00 zkB-;XeY8l}K#MFm#6NQ62#j3z8Y@D4e`IP0etiT3>)C+|>*Rip?a45?*2&qfO&*XC z30C$+FWWDVTD9OQgIe~x-@kkI^Goi<;~vDclSVqiEOYInKd|Q|Qy!cz?>*w17{&-B zhne{cOAa^24rp@XUYSw#*UIAQ5zgzniS}2&47?RiPXiq)$m6qNes3*`K=#5O?Ec}w zDO2L9s%>klYpVomCpS2j^bHwpRVz0nfSXAkU+cRPUV5=kPwnnqpGkXsQ1;kn_{PoZ z5zjHps`VP=_$77$0}mBKH0pAhb^LC?XJ9-&p{M%--GQXGF@+o7}qdd43_|9R*|P{#DKh;JjIcSY(H*>n4k zjm&(OxocT7l137`sE4px6NfDugrgwuRAc)^!^5Q}r&@|tLtd%UX7S!Q{wPfys@El0 zPywjE3yWi>%M&fj^_QyBze;2sx-t1EZk8VT%z-QOZ^#6GRw#?4=#h^Kvee^_oK!b? z2R{3uF4Fp`&dzZvg^mVYcxUI;hjWza^p4t@Hi29&!dFAZ%r9M}_j~Kq&Qx!1yPnvT z7uJbsYm4ZpEo{4B7hgIcwCS0NIwjUW@HefFF9Hi%Fuqmc-^+@xqHvX)E-q~_PBu5I z_Dh#?J~EC5ldACJr!+wd1KZV=p|v;=Yw3f3i|FFaeI=o1L=4sTkN$ z{cH1vzH|Hb`i}Q2K4gCJ{MjMzf9To$SwmgT!qwyF?a}s*IZ_gF`*&6RncD&vjo%isq?jsHE0d?)=_N zkuSP3H)Ln(Ivt5!71kjndV_kb7>vwkIV~oF5KzzCEB>bg6OY$;pEKyYa7$W{pOu+& zAo{yf{WRTpbbP$>euAS*U{5zUy?=1r=TTb!&93h4AAj7Q{NX31UokqOoP$y$1}>fz zMD~P)HF2A8rP~-&t-^@gy?MS5k6(-VuT51CH+^)QIlgt_@oer3Q*T@-gRK_c-S(sW T2i6&r;DV1{ZmK$VmjwO=xra8O literal 0 HcmV?d00001 diff --git a/src/Player/Sounds/hero_walk_4.ogg.import b/src/Player/Sounds/hero_walk_4.ogg.import new file mode 100644 index 0000000..8459c48 --- /dev/null +++ b/src/Player/Sounds/hero_walk_4.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/hero_walk_4.ogg-9e50819f5b58783431785fe51bc32400.oggstr" + +[deps] + +source_file="res://Player/Sounds/hero_walk_4.ogg" +dest_files=[ "res://.import/hero_walk_4.ogg-9e50819f5b58783431785fe51bc32400.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/src/Player/Sounds/hero_walk_5.ogg b/src/Player/Sounds/hero_walk_5.ogg new file mode 100644 index 0000000000000000000000000000000000000000..80705e8c0825c02a25e2dba5035e56db53909b74 GIT binary patch literal 5821 zcmeG=d05lOwiChTiMi-JrMPdj^sc0f*S1W>%-jHWuwW4qcCoHB6 zziIH)1X}>~fs|-m+Hxl(d7QQh=T@50NE3(o?Z+DxManpxTWntTgsMkk}JlX zX8_j?=)r`1EC*=>GC~0kHhUa1MhN@sGECgt8*@y&M)0{TulubPVaxBgx0Eh_Ks+$P zF!eYv$z)NcqlMky8OH6DjMMJc%{Ru{b>QK@FbwSzEEyPty^PdWodH?tmW2mWxJlAn&pOG<83}s^ zssho-zb?DA{sI?5s86g)mSVii;IsyQH8CY zI#w7}>vmXGU8}WV>bU()XiL)Q*F%k8Pt-`pL(FQFx?Z+*tx=b162k27)>#bO$3r^t zWQ~#PVho(io2a?dei#dTg^F6Y{=-o^e)Ddj+E6!sjCLK)D7;jga@aTy_I^pIdvewo zfxYiObZEEuS=?}a4t`gup#V#0BUCKjw$GxXkupMRU0hPSnyJcN%dvM;Zp+cG91lRA zrPhnzG+I~Id2y?}$bFRf?HR8zGSYOO7+?Od=Y-`dGYa%#vJdp)lKwjll5SdXin9L# zf2mTzVUm=(h=NANCzJ&k+G~TPpgLoev>!&ryM}w_a?a`l%{%qnbH@m4S6DS(9+BQF zxl!D8S(|xZWnMm*A2*wMZD!ZCnUYTz7QF9RZzBi5pvlw5q(V?kIaQY%#xT|y_)X-b zV^5Vko-TI@?Q>yIlFz=NhQFk0Y=R=F>`2=eChtW~ zQqlhEqW!X>yRuSZVU@VBMt!(Bb+r58kw2_&BWF#93#>45f-+p*iJU=-<0=?UePs4a z-5OVFphC9=EqvDi01TFyg=+Va2#&`z$7h=3!Hrt^uOkLxr>X2IDpYJG0QLafYHd6J znT55Wj8+(sgb6w6IJAEG{koR*#e2$}SBE?%M4qwK@2{Q+$;Y0*!B74`61BIaD=DKvIiEYP>yW0V<;L%9#TT402_-sYl9pfuncObbeolQn;_lr&$Unx zH9{ZOc{WgxCJLpY&dY*Q2EBvmRCtp7`SLrmB79Kc@5rK4+4Ly(pO^G+4*%A`A8G)) zILZQkc8n&%Qa!033hcQ_m*Yd8QKdrOGyfe9EStF)JO2eWMpJL110Jw1s5=(>FK9C^ zqb_JLI+rVcn-~IoHbgW);$Q@E_t+c1hClL*Wz%M?$xGJrpUM*-r^c&)|L3FtNKr;W z3T#H{Z~v(!*ct#oc>)jS7r}B73P?q~1|tCEqU^=L&*uLQeNP}tN(5j}bBx_q$1%N9 zA&)L6n{MO*HhPBx9g9MU^^m_?M0K?@B2p7vfu#YM+ln2Vq(7s`aapPtxMN%=Gcchz)j?#_o z8`bIuN4l4e0hmBttQ7GK=a5k!8GyM#6u=K+mY;6#!z^MSdIqo#eNI3IeW5s>Nl}^! ztr;dw@hnC#A%VkjCn-%B?yi-bfM8`S$BXHqtl}6DD&vCP2En3eIu}vw#W5 zHb~N{;4tphNnrj_4@ppfuG4l=YM7^WlvdrgU~mpGSA!c=cZj?#yTJ|St;zCM9i+zp z+`RU)8|HPK5eKb-D9UvVv5`uxHi4rlsHl7--&Lz09v?vTKa&}M8BzYjBZE-ynIii` z$ni}!1t5GY0Pa2UnRyk>y@T+e(?ib7JPL*cb1p+dt0g0tlwbBg-5(`|bEKB@Hx%FE z`1xMC$-B3ff8JmIKYO$Ml&=10fE&+8(|LI%-kmP>wxxy(9r~;R#u!>XKt{ReqL4G0 zwv1vL(Y3OQU)05rQ83EZ^ZZnb-8q_3Q>%hsL>jmO4Fq9uDg5=O1f_z%*JA)zn@WII zOMx(mgkB7DGT2(vy1Lo!t57rQH~E2AiH6xM)JMlUUC)Iv-gQ zOb9SU3qhw(PXE2`PFYMxP5a6p|MSQ4FZbifzx?308e9_jfAoCC#NdwHqhmWZ+}Pf@ z`?=xk@0{Yhj?qvm$3kTWK5J_rc{tDYiOXJ!jWo%{B4*mRmbcJ ztJhOw@{RRZi^b);&&PAV+!Z2^AQ8T(jJZNsh1nJs&}g*?V99^I-fQ32;X|vZb%(>9UCmuqRD6i{ zgO4CoL>gjwfZti+aLbH!ev` zG}P*OBjr5Rwtq`#EPvgxN$Zq>p3{uLlLwNyU9%f=eO3hqo}WBY63x|*^oizb?oBjd zoEQ@Rg0oM*Py0?>a^>~LT%y3)!64l2#H-?lSb?x5$=oouGugvLD#KJr`4v8dJt?{C zSIvMAeH_wHhwi{^j99D5Ax1O9*;~2|J|Ru}eN&pW;WuoFqTtopkHG@^e&o(@#*F#j z@?OpTudXj|t8J)YITAiA!Rj6Lv3HKvlwU=CZZQYGPpbQCX!&eo)rV`>Q^WqI3{G7; zwt%={IP8;Dm7`-_7>m665q>z&9Jk-Pry6Ht=?VEJ7j?y$FXFCP)Zqa=OB%z9b@1gK zq>?GD{+=!I@mGrSFKtxYKEzcOR6Fs5dS@ND+^D6?t-1{N26Yx$UH&xL=0?R$w=@2l zvO4;28tbkpAeH$TMC>*qZQ_*=^0rxCJd?Pu`GMov_6eHFEz;S6@h#y5XICS7SF9g)@z(3ZQz$I=KWQtOK_sOz<`ZY<@^^tzkEl;a;{;P5@nGPo%*Gf?vk{(U5 zBa#Of)tQ#;IznQa@5p`m9Ra<2sA`lDZY4~#b6!GDcS}rMk_Z#K_ImLpoUh&Iv6P_4 z6!wX$(d@nTB}2o*hEr7YP}8Xzu5Bc1sgqir?Bno(!`>p>fDU3&M9`2!?!6zMgcNPH zEfJM#E=H5x)j5I^+lUfUfxyHUGy+*B013o~;%`h^A0I&_aumX+?XEioF^U5ZdMAA+ zUuPfv53%8^4re-`Ps1hQeJ>q%Kzs@fSO%lt+!>3PnP%m2u2@Ws^zy>(l=u{>#P~tb z=W(B)!55nzJ-2@Tv0cZ3ljPN`S*fisF_8lO z)RX1oVYhesJU8!i^Kw-oL>t=iZ#p;_K^i`*~ydEJk< zC$Aj3K#T7kdFo?v8}|(Tm&D@xmA^7_f9WoGQB7%E_rTQr&QXWagO3e_=z)VYKR=n( zx7E35ijCp%;K4K6jS!a=ed5B^!DL}tTAJ00*becgG>Z9eZZk>H8(1#L(?DKzI}WBt;xafyG@>5$%L;(PoKDCv}JAIzMU)Gc_r}`ukT^k z)1RW3q*oT4Tb8z6^5V%8_jRgePmdmDj?X;aoOSCmERXmG(w(2j{+iOYuA?k1G&f)w by_)~@$jC)-=E8blIOlcUqvvbWLDWA02o-<} literal 0 HcmV?d00001 diff --git a/src/Player/Sounds/hero_walk_5.ogg.import b/src/Player/Sounds/hero_walk_5.ogg.import new file mode 100644 index 0000000..eb000dc --- /dev/null +++ b/src/Player/Sounds/hero_walk_5.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/hero_walk_5.ogg-5ad7e7c78f2b3d0ff4c89ac846546604.oggstr" + +[deps] + +source_file="res://Player/Sounds/hero_walk_5.ogg" +dest_files=[ "res://.import/hero_walk_5.ogg-5ad7e7c78f2b3d0ff4c89ac846546604.oggstr" ] + +[params] + +loop=false +loop_offset=0 From bce8d50a93a8514cba88ecc4cecc8d92d552ac7d Mon Sep 17 00:00:00 2001 From: Paul Norberger Date: Sat, 18 Apr 2020 22:27:08 +0200 Subject: [PATCH 3/3] Improved hero walking sounds --- src/Player/Player.gd | 11 ++++++++++- src/Player/Player.tscn | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Player/Player.gd b/src/Player/Player.gd index 52db787..cc7af63 100644 --- a/src/Player/Player.gd +++ b/src/Player/Player.gd @@ -20,6 +20,7 @@ onready var animation_state = animation_tree.get("parameters/playback") # Variables for sound selection onready var walk_sounds = $Sounds/Walk +onready var walk_sound_timer = $Sounds/WalkSoundTimer var _rng = RandomNumberGenerator.new() var is_playing_sound = false @@ -133,12 +134,20 @@ func _on_Hitbox_area_entered(area): func _walk_sound_finished(): is_playing_sound = false +func _walk_sound_wait_time(): + var x = abs(velocity.length() / 100) - 1 + return log(((x+1)/4)+2.5) / 3 + # TODO: Rework anyone func _play_random_sound(path = walk_sounds): - if not is_playing_sound: + if walk_sound_timer.is_stopped() and not is_playing_sound: var sound = path.get_children()[_rng.randi_range(0, path.get_child_count() - 1)] sound.play() is_playing_sound = true + + walk_sound_timer.start(_walk_sound_wait_time()) + print(_walk_sound_wait_time()) + # Overrides ready method for this entire script, checks for the finished method of each possible sound diff --git a/src/Player/Player.tscn b/src/Player/Player.tscn index de30fbb..62acd16 100644 --- a/src/Player/Player.tscn +++ b/src/Player/Player.tscn @@ -731,6 +731,9 @@ stream = ExtResource( 9 ) [node name="AudioStreamPlayer5" type="AudioStreamPlayer" parent="Sounds/Walk"] stream = ExtResource( 8 ) + +[node name="WalkSoundTimer" type="Timer" parent="Sounds"] +one_shot = true [connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"] [connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"] [connection signal="area_exited" from="Hurtbox" to="." method="_on_Hurtbox_area_exited"]