From 83ffb3189b609cdb1ca70725239dbc431fffb131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=91=D0=B4=D0=BE=D1=80=20=D0=92=D0=B5=D1=81=D0=B5?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2?= Date: Wed, 25 Sep 2024 17:42:04 +0500 Subject: [PATCH] Audio --- assets/audio/sfx/pop.mp3 | Bin 0 -> 6731 bytes assets/audio/sfx/pop.mp3.import | 19 +++++++++++++++++ assets/audio/sfx/slap.mp3 | Bin 0 -> 6653 bytes assets/audio/sfx/slap.mp3.import | 19 +++++++++++++++++ assets/audio/sfx/spikeweed_attack.mp3 | Bin 0 -> 6782 bytes assets/audio/sfx/spikeweed_attack.mp3.import | 19 +++++++++++++++++ default_bus_layout.tres | 9 ++++++++ resources/animations/plants/peashooter.res | Bin 695 -> 862 bytes scenes/entities/Zombies/zombie.tscn | 9 +++++++- scenes/entities/plants/peashooter.tscn | 3 +++ scenes/entities/plants/spikeweed.tscn | 20 +++++++++++++++++- scripts/components/zombies/AudioDamage.cs | 10 +++++++++ .../components/zombies/RuntimeZombieData.cs | 1 - 13 files changed, 106 insertions(+), 3 deletions(-) create mode 100644 assets/audio/sfx/pop.mp3 create mode 100644 assets/audio/sfx/pop.mp3.import create mode 100644 assets/audio/sfx/slap.mp3 create mode 100644 assets/audio/sfx/slap.mp3.import create mode 100644 assets/audio/sfx/spikeweed_attack.mp3 create mode 100644 assets/audio/sfx/spikeweed_attack.mp3.import create mode 100644 default_bus_layout.tres create mode 100644 scripts/components/zombies/AudioDamage.cs diff --git a/assets/audio/sfx/pop.mp3 b/assets/audio/sfx/pop.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..1a22981b7505d7fc192527f0e96daf65929744a2 GIT binary patch literal 6731 zcmds*XEfYF+s6Oc)yt|uge7{A)w`@3g6L5~SkX%&T0~tX79mQodW-12mqhQq3nDrZ zEqb?)e8~It{rbG`@0>X^=ggcl_sraL&2lGj}QOI_(%0Wy8iLwAN&8n{Nr{mO*L6{ML|A(7z|YZFG67`D-K*8z*_tphj=`T z>A#Nuw>9Q+tL00D#Yrq>BInSfm}F9&PiJs3;L|T+tAF6V$Rb8a$nT!NG}- z4J61g@sR}pNGL5IS>WFOqdcaYNn8-c-Whax+2xP-hKiFn6Cb{0>mTnc)F!c?YV$EJ z?tw7JBss+^mW?(%MtlZNx`&(`3UFhx4!nz2%vCeQ?||v|n;z!=Gw9wvXhVf;I6IBI zWSz~Mbf<>#K0SFTRSfKFuX~gV)n-M&cISN_(3(w=pHis1n0uzx#{Al#aHv;9SskmT z-w8|-8~Dn?m6#YGpZ_d7qp0ZHNFKJ`l5r4fdtA} zIXCUwXka>TueV%9!mrVA$QbSVvFM>74qv2d1~z;`k^+r?KE6Lb%3ykDmhP8_@Nas| zCY*+k<$cHU2jT&!(HOgEF}Zcd%Ew5rryO+w_IEc;N-Y%71IY|!mSK1{c}bRbtq!q0 zn$JKnoMvN2avtcl;7=rt#V1MAu~_MacdOjAR{Evy5=U|181~+U&FTHr{=>tpQ@Sf4 zCW-x$tH}c`7;Gc8mHuPyV^Jj&IpG4{F=>Y__B%iC_=ytC(I?N(%}nUrf-f1VOuJvo zg~2Y9gjCT&Gi&3m3#+(;LL*`6KBrqL=t&pBabTYbpDi>~MqLB457EA(n0+eYzN@{k z;GDJOgexGA&cKF%6Ev}TsP~mJU(rJdGFV1F&6{=fqR`p_AnNN>P*}bEPWo_Y&8xEB&`ecbEHV?D=bK%cN|w?{ z(MMa4kf+bxDc4opIamy1ZIdXve4eHTZ5+9_7J;>bbdUl`plQTfqIX5(`EH>vH0K)K@p1d8M5qvpfPtakm0N%l0u3T; zx8D#=d|}^k%&o>9AaPFl1}_PoHyF3)`%2k(KwA9-2g+VAC4OAL63vc#D(*4UZsksI z5Bl1);t)MXi5HAI2G`=TtvX#rm6au)@?ZKBj z(^^VWj!^3|7xDT;B@4h^#~=`;+SuW3zT+QNhwgkEv~72VoD@D2$7qS+>{?WJ6W8KA z%3*t&HqOR#en9Q-&y z{w3m`_tx8lv#0FZ=bTgpIbnsi79tiemS!wsURkZ_vpqnokG>g!?JBdSwujsoVsTn6 zMTPP<$SXh)#*@?oQCDIvsZ}wZ58bC0?ms6L9j=b$8s{066;&P&ppXSs#t*0}8{;p# zK+U*y2T*tdZVE_$`7%9f8^{sxr?UE;jHr685~Tdo+fnWlEvJufV5wGjzFG@$<8;J) zd~g^0ZC&b{-RTEjD%1B*xBFjha+@f{7cbi)%3pNfA*ij|-w{mNtLQ6txv5?_%c(5b zdN)zqb(2p9yGh4fwpa`TpiP;9Egm5|FVsw_bYMG;c(Q19E|OcXB3B^o54g+ecw+M6 z+rsW;j_=-$+v3mj=^tuy;|ARrrfY9IjIV0@(YHfPb4m5}0}ra&fMi6;y!9@2deZs@ z)e0Tbu}N#lRNqpL#r-jzivvB9oyuzItf$e0#cCi4nTIOu@~_>0on%BK&1LV^J>+t8 znDB>j_PltdV+xbTil200(p@!@RjrV=f9Utb+++d9y!GaF;rzNV;ivW2>5-B98a^8v z8=^zZ7@FwS68D?g>ESQchZ=`pO@E$YFvpnb?vm5(1EjgP2tFeRDK!=r zxMfJirX6p5GLUAq5uC^a(A6cPlM~O*_9adpciUlWu1%2waw~fL{3BF>gxEw_>=5|f z@~1bIxS-Mjh*KAK$|rAS+1b=bOb(~Pp z1bV!~{_x%6THD%~8dE=iV{$S7_c37|E_SD;Wil5j4FxTqf|n(~n@ZO(m*>)qyD!g7 zzQv3A9(?Qf8j3kFo}#ngo$zw^!(f__fD4$dOo1A1aQnLV#8fSc(HNa8J};xmG-xgY zU+ps^^{EQXDO?ljQs2S_)dpq1C# zd|N-Jn}gH0-`sCgd(q+yN#J0m<@?qGGB?nhK41axwB~Bm-$1d+O1V#A6YzKphH1(V zGf?}ra@q~;c-s7J3~}p&F8+ENd^iJu#9@{!sB0y`E$huCwrRP8#o9uLozZd^Youim z@b2hib)B)||I-4+aczBs18sp|fm-h1RCUH+Pqa+oc(+CYXDuXvaoY<3A_fjrW>>El zhh^}~5<|#{aEbNBgvO00ivc9}1}UgBN%mcMS{Q%gNDl((%*9Eu<5m171BuTQQ~|}W zO6csXw4@n`-4de;$^b?f>^S$GjO+UJP{iT$Ji^Q!ZMEav2H}9Y5UrgGz19fSq{X6E3$kmB6{qVaYk0N?6_okzrBoe_}(Cq zXD@=f5tPxMB&LBm`N=~f-e0L;cz9#S$whjxO8FR&ewdrPsHJ4uHSO%3_&Wv5 zU}C>tx4Vpl0JJm=V4wx5yj>f6YHyhf;zwI9q^u=9{I+^z!yEmOLz{HK%wL@?0sYZF zF*bBP*U)b&q#X~MU@TbFFqG|p7L}!Z=2j8E=V~u6tB@6I<{iytIB9pB)g$_lngn;% zMK>Ibh!WweN_^{ib3Lj^NS)!lSuC)xcrov|ZMM5ZJqhm$49$XT|EyPgZ`93B+hv+n zi4*WcN%OuoMTTJfSXromO@*$JbG>+cF3QA^Wgy380N2W1*5A4wS@MCN#{5hxt-EyK z8K-;cWb#-1VRPAMZ4o|G_A2@#2vxl02A@<@HJx2FGD}WZYtj6HbE;)|gl1KmXHUt8 z$OHj9qItQvI7ogZ^|t*_)|2Bux&zj#T@A$|omF(je+_we*EK@1`)}*YbDfx0h4xo; z&1Yq{B{K(T0!l{D($DgmabYeyWw!KH*u+hG?aO z`h~>1#ClwcynbYk^BQy>VIsbCzV5QEHYxRGdbG;eIHrFz`5mz|^< znbu!Fa)JcgTNu7ZED}n5uq$4S#iABZ)K@E~gO(w=T>$`eNq6DKIg}su8(Ed+^?1Z6 zGIa@rx(ACRATun6G{XI(!i=xDrPp?gxieQKr)XbI4eFdEpG`Y-uqorXN z3-�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 o0D$q;`lJ3xsx9mB;y+);EM zw!v5x#R7oE3?gs1cU#vIv9Of~T4J#iY2|93f)nZtRQ6E(0+#(FOaaxtBARU}L;yqp zN&p{_HAp!_zNi)3()Nm)#na8an9W7 z@fN`NdbbBV{#X7x{FnS^_yd?FNs=TY8ZyWq2UaxM3g-1L9L8H<}GW7PgbJnOaAsq;^nS~+T!fN{#(>jD2M zC=>rh#F^9f!2?I8b`Mom7c}fi{HJir^8j6z5pB4djOa!*iZ&#M2InkNjmU(*kPV4e z6m4v83N#zdgTYij=57o`o~iRl0$f-CxL`4B-YS<0#YDuzqyd7esn)K8YVD{@r(t=x z7n5AXQbCb`fC!vUsLrEsXHyA&DpMU=ai9W`p(67V zfW#nKLLwOv5ei6VVL^TF9pmMu&YOtHfTFb-vQ31nDthf6JVy=((>53!$sk+P>`hRJ z)u1chfI_dTP1s+N%Sz}Ly!wkRcGEKq#|tX4RD1I33%hb=2_1&+_D-z~^!8Gwwi<|V%uwsmgaX)pyhnVPp%p+F;A1?$-%jP!) z8T5>Uuc(;SSpfGV`NKgDL3np*e%L>1bK)AHf8^(QY`T^XIFoLV$xgB$_EYoM3rQxK zK%A?H%?Fi~olaJGtHL4V7$4F@bAlmE*f4Rpi!0$D|0AOf!6vpMR dxs=YnHuLEUn|}3w`YVutWD#y9ZXQxoLqkHYK+OOE diff --git a/scenes/entities/Zombies/zombie.tscn b/scenes/entities/Zombies/zombie.tscn index 3d34969..c26b14e 100644 --- a/scenes/entities/Zombies/zombie.tscn +++ b/scenes/entities/Zombies/zombie.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=26 format=3 uid="uid://co11v3w8hbwgf"] +[gd_scene load_steps=28 format=3 uid="uid://co11v3w8hbwgf"] [ext_resource type="Script" path="res://scripts/components/zombies/RuntimeZombieData.cs" id="1_qq3f1"] [ext_resource type="Texture2D" uid="uid://bwwbkybryi6k0" path="res://assets/sprites/zombie.tres" id="2_4pdxh"] @@ -7,6 +7,8 @@ [ext_resource type="Script" path="res://scripts/components/FlashComponent.cs" id="3_rao3m"] [ext_resource type="Script" path="res://scripts/components/zombies/ZombieMover.cs" id="4_u5syx"] [ext_resource type="Script" path="res://scripts/components/zombies/behaviours/BasicZombieBehaviour.cs" id="5_2pvkr"] +[ext_resource type="AudioStream" uid="uid://xoy5ct1t17k5" path="res://assets/audio/sfx/slap.mp3" id="8_di4dd"] +[ext_resource type="Script" path="res://scripts/components/zombies/AudioDamage.cs" id="9_oxd1e"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_63ls2"] resource_local_to_scene = true @@ -206,6 +208,11 @@ script = ExtResource("5_2pvkr") [node name="Node" type="Node" parent="."] +[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource("8_di4dd") +script = ExtResource("9_oxd1e") + [connection signal="OnHPChanged" from="." to="CanvasGroup" method="DamageFlash"] +[connection signal="OnHPChanged" from="." to="AudioStreamPlayer2D" method="OnHPChanged"] [connection signal="area_entered" from="Eatbox" to="Eatbox" method="OnAreaEntered"] [connection signal="area_exited" from="Eatbox" to="Eatbox" method="OnAreaExited"] diff --git a/scenes/entities/plants/peashooter.tscn b/scenes/entities/plants/peashooter.tscn index 36968c8..8a3e0cc 100644 --- a/scenes/entities/plants/peashooter.tscn +++ b/scenes/entities/plants/peashooter.tscn @@ -115,5 +115,8 @@ script = ExtResource("7_fdkt2") shape = SubResource("SegmentShape2D_v570y") script = ExtResource("6_0812i") +[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] +max_polyphony = 2 + [connection signal="area_entered" from="Eyesight" to="Eyesight" method="OnAreaEntered"] [connection signal="area_exited" from="Eyesight" to="Eyesight" method="OnAreaExited"] diff --git a/scenes/entities/plants/spikeweed.tscn b/scenes/entities/plants/spikeweed.tscn index aa22889..fa21ed0 100644 --- a/scenes/entities/plants/spikeweed.tscn +++ b/scenes/entities/plants/spikeweed.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=10 format=3 uid="uid://bdhod5c6o53ha"] +[gd_scene load_steps=11 format=3 uid="uid://bdhod5c6o53ha"] [ext_resource type="PackedScene" uid="uid://b1hjjbdwf1rtc" path="res://scenes/entities/plants/plant_template.tscn" id="1_vmbvr"] [ext_resource type="Texture2D" uid="uid://coafh3mjharxo" path="res://assets/sprites/atlases/plants/spikeweed.png" id="2_ffrjr"] +[ext_resource type="AudioStream" uid="uid://ypihbxy7tsqn" path="res://assets/audio/sfx/spikeweed_attack.mp3" id="3_5wcts"] [ext_resource type="Script" path="res://scripts/components/plants/AreaAttack.cs" id="3_hqtbm"] [ext_resource type="Script" path="res://scripts/components/plants/behaviours/SpikeweedBehaviour.cs" id="3_uhpn7"] @@ -51,6 +52,21 @@ tracks/1/keys = { "method": &"Attack" }] } +tracks/2/type = "audio" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("AudioStreamPlayer2D") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"clips": [{ +"end_offset": 0.0, +"start_offset": 0.0, +"stream": ExtResource("3_5wcts") +}], +"times": PackedFloat32Array(0.166667) +} +tracks/2/use_blend = true [sub_resource type="Animation" id="Animation_h2f35"] resource_name = "idle" @@ -107,5 +123,7 @@ shape = SubResource("RectangleShape2D_1di76") script = ExtResource("3_uhpn7") _player = NodePath("../AnimationPlayer") +[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="." index="4"] + [connection signal="area_entered" from="Hitbox" to="Behaviour" method="OnHitboxEntered"] [connection signal="area_exited" from="Hitbox" to="Behaviour" method="OnHitboxExited"] diff --git a/scripts/components/zombies/AudioDamage.cs b/scripts/components/zombies/AudioDamage.cs new file mode 100644 index 0000000..da814e7 --- /dev/null +++ b/scripts/components/zombies/AudioDamage.cs @@ -0,0 +1,10 @@ +using Godot; +using System; + +public partial class AudioDamage : AudioStreamPlayer2D +{ + public void OnHPChanged(int amount) + { + Play(); + } +} diff --git a/scripts/components/zombies/RuntimeZombieData.cs b/scripts/components/zombies/RuntimeZombieData.cs index d566d74..5aacc3d 100644 --- a/scripts/components/zombies/RuntimeZombieData.cs +++ b/scripts/components/zombies/RuntimeZombieData.cs @@ -41,7 +41,6 @@ public partial class RuntimeZombieData : Node2D, IEntity if (_hp <= 0) { QueueFree(); - } } }