From 9ed44ec7d232e19c336ea4ee65b4695f4cca00d8 Mon Sep 17 00:00:00 2001 From: DRuppFv Date: Sun, 21 Aug 2022 18:46:58 -0300 Subject: [PATCH] button sounds removing random println button clicking sounds update cargo fmt & cargo clippy cargo fmt new audio at start game button --- assets/ui/down_button_1.ogg | Bin 0 -> 4316 bytes assets/ui/down_button_2.ogg | Bin 0 -> 4407 bytes assets/ui/down_button_3.ogg | Bin 0 -> 4168 bytes assets/ui/down_play_button.ogg | Bin 0 -> 5033 bytes assets/ui/focused_button_1.ogg | Bin 0 -> 3753 bytes assets/ui/focused_button_2.ogg | Bin 0 -> 3652 bytes assets/ui/focused_button_3.ogg | Bin 0 -> 3688 bytes src/audio.rs | 21 +++++++++++++++++++++ src/main.rs | 5 ++++- 9 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 assets/ui/down_button_1.ogg create mode 100644 assets/ui/down_button_2.ogg create mode 100644 assets/ui/down_button_3.ogg create mode 100644 assets/ui/down_play_button.ogg create mode 100644 assets/ui/focused_button_1.ogg create mode 100644 assets/ui/focused_button_2.ogg create mode 100644 assets/ui/focused_button_3.ogg diff --git a/assets/ui/down_button_1.ogg b/assets/ui/down_button_1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..fc79295015ebe09ab1b0f50b96efbdca39e6e9b1 GIT binary patch literal 4316 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%0DmFNmGfXa1-EPP{vv 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 literal 0 HcmV?d00001 diff --git a/assets/ui/down_button_3.ogg b/assets/ui/down_button_3.ogg new file mode 100644 index 0000000000000000000000000000000000000000..85ef394e5f531051c64ae6356b23d3ef200faac8 GIT binary patch literal 4168 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 literal 0 HcmV?d00001 diff --git a/assets/ui/down_play_button.ogg b/assets/ui/down_play_button.ogg new file mode 100644 index 0000000000000000000000000000000000000000..735cd2c299156ca524d4ba56048327a99bb857c3 GIT binary patch literal 5033 zcmahMdpy%?|A%2DXYRLElw}h#O-w0s31h`(E_0T`L^ENgRL)W6lH1W5$|1x=p+=Ob zR7h@x<`Pmlxpbi`&fBTpXH&iJ``7z?p5OEP{=T>8dA^tD`Tln8+ed+;2YYR;b z>b~2&PHMGO?1AXOFt!*WGiHZ8*VS&qXQnJhMwe}9)Qji@4 z8M3vFcL>;;T!gN@ht4F@zL)u0$KGA#IMTx1zYE3AHYh8$PxVJ1dzejy!~!XVL+ac# z0^ER$vi0R98rcFU6%TM>VjRN$$KZqy1yllj6?f9yS}E~`^%9cng!e@N+>Ac=7yE1Z ziB)*OY-s7?ktm0sL2~bypwo`GnqSl8!Yt7l$Nw_#c$B!pJ~cnl)pALfyN_^4b9oL! zf=hOy9HB#-yMq8$Acw!E&g~*p=yHwm@HJe0T(Aa|4MD}{&}rw;iU{3WMW_RU5O$vG z_o9&ZPa^LNkt^UU{bYe3AUNQ2Nh@>7`pbo9=*L4z`qYUFCSA3XZXpqOfglf0C8sEL zd5K&w1i_1~(*(Y0g3z?-)GRnRxk?&JfFKx{2IoN8>dbe1;6)v3V2%D)_s?bMNW_5+ z5&dBym2#=(GCFb+KY(QHn=WWA_ETJjjD&Fy^Nq#0sNUH<1uE?TT3;QPou63`Ald4$ ztb8{ifLt2m$bY(tacr?F$?&pm7FnPs{;assnEU6$HURBvpM6q*_{k#SlNcH7*A9`K zxpxc$@1G9U-=PwyYcWe$oH19>O)Ri~**6nf#WUzT%Rj0f~3EPTr*ihX{rm!preVKFk>HNei-ZW-) zJ(-9R@X3l2`{@JQ+so+$XM2h@2c}}q7ep%>S1g-TU+fwP+VvjUr?Tol{T=dw3d&Oz zbkhL~%K?fLmBSdy<@jBV_a9E8FUF69zQozb>nkJy zZU{j!hR)H3&SXO;G5{pjO;8eB7kL+J=oD?z)sI`=W1pHWFsM(=@}cqF0T85g|FU{l zACjbs5|K@*6jKq|NkpOkzeXCsk<@@;6~qbqkjCz=&dVaqRONM`%Zi6~;-|`ny3xlA zrV-en)Az_&2c`C00+%lfj0S@|L0(}yu&v1GUe}j~PQ7^JRf2ZBb7koxPol7#wuLBY z@M2CDfX_~}faZ2_mB5R6K?sB(dGM?#d6=ysWv327$CSv5m?VB+FJ?NM+=-t;2BzW9 z7X0 zoOY?xht!-zIk+C2rKcB_q)rlfQT;SY)Lay46N#iwrKmYkHK>$a61AT30LL2fqK<1) zMGXx9g?OJ_&iE$Mi1-swIpCAtz#7l{sfs$}MIGG?sFt2FbWbY74``01`wdZj2IGNd z5rs6OL8azWM??&2E+-&{I_^y$8KU|P#*Ypr1q{aDskm@GqO+#vVr|vuTC>mB-@M|x z4!DaKBy#kml6>k}6b{Q@&1p!3D#~@DaDbNh01jhh$gz*(M9pD{r_5o{4>EkN0udH9 zHhv<8PS4}eeM9^glLj~(dJbd4hvB!#px+zhOf0$&G?0cwoB=9lVvzIV3~O`=h;gX7 zNdbUwDCt>T#JJX3Pbz1ePY(cMS`h(Ok8eh7y~GL{-Bx>Pos#p-%O>>E&DU>|PIJa* z^cUJeOC((Y)Pq~t0%^c)6h za|;~Y390Id;3&Xwv&pU6+-^KZhfTJ}R3?$h>Dr0e`1L6EP9nNQ;6ZdN;SSnkgh^yt zc(o{>mTt-Ir=bP)9>nxYfv!K(az_TCqu>+|ZzSML2;F$&!bEU{f`g7`f@$-`8=(@j zi1G#k9?=~o&~`8u=I{dnVVD-)*mjzY7PRq*;V6NxzdOD`o1G<|+(8YB46TuAyDOp9rPfl1A-e73sgl2UknmLP0Lh+ z(5QCJpqlD>T?fqaKo$8QSCfprg-wqMsOVN6u!u(RW-H^Gg*zF^4Sk7>uD7C zM)9f|W&PN5HxeI$ows=qGpg%p{u%g`?~|w11654n0w4fYZbZulZDy9`LO$&xATaj} zr}EkJ*r{O()AFh|6U;#as-^~mK=C7^433BO{9_>RrNwy z!%pj$k+D-qF40+J+j=#3INQ`0mTP6DsamE*u_Tp`>M!dQ{|M||lE%zYkEleINme%uj zw#MkLFp;bZ6mGz`1Q&xu1h`5C2r?0zjoOi*EHN)pQrE3jg;GJR!cT%LGLtX9C&iF} zulln#`%jhjKaec6w96V=+CE&25n9`o7;KPA07_f51*fBxY!on-8F;x8J|9?WZw3}F zD0@V6%V8sku9fw}fmH>G9%N#5n{E(@sX%hh+9o&6@C~=3^Q%_W%u4#%qBCj zgEaR1jl99YD$D7yM8usd>OnP)3r~;CV;X489@`~-u7^-WW4{#_lj+#SvBbBa!2C4> zKfRj!_O|?92s)T3134bg+*D;)sF5Y7CEhJu0n$eV0tXj>JOtYY+(>XaqfulDPT3xg z3jTo;@H3YA6a;+UcRo-@SWFiKS%4!GC9-faH2V{W5m&YnDhBlv5^xbjw3rXr7GV#D z?^gbSlfsG56A6|`0-NaEKHg4A2RDJKdE-PnDV z25@Xer9BaojCJVLFUL?64U!DlX$I0IZQgEe;9^I>AUH6Axt)i(45Xxt*d|XfvWvU| zs$2WuWEY$XEJZ#CQo(9KhU?LPN!um0IX!NZjnR2}+-%MUVUIYDXnhVTy0qL@u-f`A z*=X!3tneIJUi?1+0q_3;LHA@4Dt*Wu$?bB^Dfi@EKs5|n2h<`DwHQb{I^t4JmI!b6 zJ$omm3W}8P4F-crAP|QT3?})zfoX%oQ{2RVH)8x7saX!f%;Z7O{noCBD8sb|hNdRl zarBPeQsa6IeUp}Qg5un_TkJn*VT-<>6{>Uog}PZJ{XX<7>FCFqIdp^<6Cs5QIBkla z(;8*1mn}PZ?^OI}T>Z3K(XgFWeq+s}XP-o0oe%<@%H6NdG+?Z3;>OYP(6iz_u%bg> z>bIYbFYH!hXEeH%LZQZbYS1%RIAq;=@}>9*T!il>A4L%U$zNU zwHk|bf3()%v$xl+kCTac(`3)DC*WbO+hKd(9Bob2dHj0tA{HC+wEaud691u5ZF^vw zw+Wh4QJn}|J4`=lN?ZTYzbHi5-Dva2UB=he1x??kiDsKyD{M1W=sQb$U}2}WT&>IN zojan~bT;hKaMoKZ=C|hZOCzm?pA-(c#UANP9&iojeTuzgdH$g9;~BYa#yw&mMV=ht zc)o54iCqDs@y?v7A1{SduZ?z-qaMGkj>5Sp7eayUyVGm z+H3S*9j{};N5>Tzm09YI^%Zqr-?7LUFUm)s$PC4Vry$t3PD+j)27 zl{a;^NLP2|IGDw@XTf8xo0VL=LLf5hK3H!Ycl5q{a*E>PH?mTLBlT6GM+R)>a!~VQ zeM*+2(x#?7*V2~5{c{^rq7F@F9S)jYaI2&2&r~j7{pM6(rB`Xh#!Gqs{PFcl_@cZ; zlUmBFXS#P&x(wbWxfFS!KIQFuaQ@(#y6X>iOw7OvEgLqxXbDs2)#PNx2`_DX@_SFf z?^;Kr&^A|;U4@@FUe?J>ztUi@xu)TtyQps$=Ay<5^}p_o)HBUz4S)M}?nBr1+Keyr zqw#gbk-DShc?a+rFYr0h@Rzf^-4^=?0}mYDt>t{9I`^^CWXL{$`PH4>d!!?wjHiP$ z;~CXfYGH6CsnXMYEtJva<`}=bwP!yZy_tn(ec^S-IE05WOZzXJpG-IQTT608Mq#5#rI+fSvu}#hSmzN<&)rm z{bs3ufbZW&@18rz(l?fwunmmbSEPDk^pAvp?xvVt8~OG{d5&_d(i(kB1>J49g%thl z%lOMRQFV2Hn`tR+-uP(EJEsp>{;00)vCUx%aj;KF>6>S|_rTD_&{#zNpQlCP!>c#Q zW}Zdao|;9%UKm9@o~I0%49y3&edMGYeA%blS>vK`=dSyZpYaC#(4qZ}nLe6=ZB=B| za@+I1Av+H@`RfSg&|$Z;k5k_l@0b$WJ|IjUG~E?1bN8YDy7HpB7;}?%DTfqJ{32Q) zr-nQ1%wj4`@Li6CC2x?KwdqhYtV_Q8)$?Q$FMfL|S;yUu60=pUyW9b{d0y{}QPbYh z&R{0|xykuFZ00C;I@4}~T5s<;pBvx4{{7shkoXR7Uu3JHA*Ay3TTF<>_!vI!chQrM zf)PKNzZSZ2XX*_-vN(P{c$39djjqNQM-*>Zjr?8x?APaYG{VK34a9P-b&uoqB2f&6 zma5wCpBkx-)!3A^QFq;w>Jk@TrRrJ*>CZO!U}yKtv0)d^wV1EV6SdW(JDZG-;T(f3 zqITVwDAN}ZdmbKj`-@fIiVi%|8&T8I$*njx)uVALyy86FY9_|^NINDtErcmjlOZ^!s=gS`~M$aKyo|^Vm z+FG@Z9W}~=^Hd(Z#P~c?iyhXLRd@YWA?#a|Y-nV5^6agf6yiZO3+HD?d+*%P7`^rP zsWs}6wb1JwBTVVVAiSM^!ltXvoQ)}w(H~XbGS#Af4ZgHbjr8%n^y?iR5utrWn~s@7 zbB{lx^ZgkfOJ;TEJmubPDQS5czpZ#}-?Fm!!1i@oA<))vvlyAvmF34(Aed`h(v5iuZG?Jak=piJUc7k0P&@cU<>}<)q{HRr=7R38OG^n2&CN>C=Sc_X K!~0r$`F{h70BEcL literal 0 HcmV?d00001 diff --git a/assets/ui/focused_button_1.ogg b/assets/ui/focused_button_1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..6cfb2a279f6a9a6d6e8734914bb5fc9abd2a3d20 GIT binary patch literal 3753 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 literal 0 HcmV?d00001 diff --git a/assets/ui/focused_button_3.ogg b/assets/ui/focused_button_3.ogg new file mode 100644 index 0000000000000000000000000000000000000000..cf512a6ed027032c8f7eb5834a1eb98215f6d592 GIT binary patch literal 3688 zcmahMYgki9c6bM*G-AMju|k_jf@ldQLh!L95P?9H+;Dk>&4)Z9NDL|=R(6X;5|Bn@ zF@~sV?1Cj06s)0wVpmr!paLRDL!ii_q68oH(S8+byWO1|l(xTmzPWSHJ+GNLbI#1U z8*_4mz#hDYJvT0G!_dDmMep0aW4Ci#LFN`YMzD)&!d?KBgxT5N=j=9Onsb0@Vw^QD zAMEvr_}}kfkHf5)w;(q@W9MdO=nCel74%>_CcXqdlKiY~*^+{_keLOUs~8y5Z|j!K zSv@SNqr3aw^iO zd-|(UfGO-{?;@zwY@EM}vNlDd3|I@X3Kpbo!Dx8Sn~uxMgCBoUsjdW3)ukQ5=e$*pOloE6{orfgDCco1^vYP~ zjISz(y~}%c3^F^WTItNbMpUh5!x=cU&Jk2S>;_*|APcud<;TeO0@VQ29;2#{QQh#q zEpFf%0Qd+2;pz_3^#i2qCel3ITd7WP9{>)@#i;9Js_w^V$f+8NtxbM>BB-au)*F1+k^gMb-NK ztq^l+-cqHHGeIn-y$Jav4x`C2Q?~9==R=ZV0ruH&p$iS>rfyu^Y~nP8Pc(B_hFw)t6`I^5x`symvhL$g&YybxXKkJ> zz{vmD42R&&<_(`)Gw0*IYhJ&|asW3h+*};cHWn^;!J^O2dis`Q4{Zoos3Pxn;%A=f8WbjU9}~CS;Bh zp#0=knNT51Tfnt=p=KRdsDM_A(-o2tOVogZi`Gc6A!{V!4O%I+5B zk1hOEfGWnc;&iCCFh4!?+l%>YzK~^&u509#X1!=1Q*}#3 zHMS=3_B9%P)1=JxmF#PVgBn(VQEOxLvI37P;SmZCI#Cd{EZr3JjF;^3FQd-0B-i zn;qQjoz;8+8=TUm;qAu;-`@_8!wsefdQnq*=de`P{-a*r-`FY=#)Z*xEuNqP#wzXrydw8&v3nB3j9SmR+U&O~?GKm}nAsQx zX8tlLo_nTGVMVcdF4n^?mn-j?NEDe}Gx)76NSJ|vPqyKrbIvx#ZFt;AnB zL&!SS{_@V>pV8Vx(i>}M{8R}hvq=6ND<=2Rr*A8t!vgcKl`QK!s^^zoG648M=>Vci z_pfXsAN8toUWlz0=L-DrnQ(&*Fc0Cfp)?6z&QuCwqj_*}lZyq1G? zM2NK(>OvaAv+3e6?BN`ZhE=vUE{!sW8C7^56_bO$#dBcy+RJZfnmHPRyrIFZdM&3# zVqpnN3WK3aWC!@5-Wi{{E_|oN7QYby5IT~CA0K7+(sLU9arA~p4v$t&kL>n4P7}KM zm-)-p{`Pg9NpYRPxk`k zrPTZO5oMj+Z#$g|eeRU5cp8r9;7jox_kdf>rOU3NYhIKG+`i*@^cdoT{Z9b6`)>nq z)d@d;fV956%Q<@QRhJl84MVsFF1dh9{`OH(jJ*fyOqU1lzOeIzMapY%bab>~Fb;vE zqwVj;(FOZyfq?zpVDxGH9fp%{7-d}e>s3(hyNQ8*i+~V0zxhqLO)_v8wQ)!?X)i`nGrl1 zU*`;_B3#1z6}xpG{;>Cb)5)85i-tFSSYRdlZEnGbC_zbR$3&iGo7Iw?^O5v{X?*;| z#6h_wobfB0b3aeAV&GSSFz2T+R`QZ1l81S$?xc?n#+*vhRTQ^|^j{iZs;MhWf8?H& zGkO0XMc+A~IXjEyO=gQif&;$Zo0hxPKK94R-mj<`s|!}gy*jWxX|et3de@bwQ4sWh D7#yot literal 0 HcmV?d00001 diff --git a/src/audio.rs b/src/audio.rs index d83ab219..6c6f4775 100644 --- a/src/audio.rs +++ b/src/audio.rs @@ -2,6 +2,7 @@ // Also for cleanness (named channels have evident function), we don't use the default channel. use bevy::{prelude::*, utils::HashMap}; +use bevy_egui::{egui::output::OutputEvent, EguiContext}; use bevy_kira_audio::{AudioApp, AudioChannel, AudioSource}; use iyes_loopless::prelude::*; @@ -92,6 +93,26 @@ pub fn animation_audio_playback( } } +/// Plays main menu sounds +pub fn main_menu_sounds( + mut context: ResMut, + effects_channel: Res>, + asset_server: Res, +) { + for event in &context.ctx_mut().output().events { + println!("{:?}", event); + if let OutputEvent::Clicked(info) = event { + if info.label.as_ref().unwrap() == "Start Game" { + //Play down_play_button + effects_channel.play(asset_server.load("ui/down_play_button.ogg")); + } else { + //Play one of the down button audios, except down_play_button + effects_channel.play(asset_server.load("ui/down_button_1.ogg")); + } + } + } +} + pub fn play_menu_music(game_meta: Res, music_channel: Res>) { // This is a workaround for a Bevy Kira bug where stopping a sound immediately after // playing it doesn't work. We run into this issue when the menu starts and immediately diff --git a/src/main.rs b/src/main.rs index 2df91ad8..10194be1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -97,7 +97,6 @@ fn main() { asset_server_settings.asset_folder = asset_dir.clone(); } app.insert_resource(asset_server_settings); - // Add default plugins #[cfg(feature = "schedule_graph")] app.add_plugins_with(DefaultPlugins, |plugins| { @@ -132,6 +131,10 @@ fn main() { .run_in_state(GameState::InGame) .with_system(game_over_on_players_death) .into(), + ) + .add_system_to_stage( + CoreStage::PostUpdate, + main_menu_sounds.before(bevy_egui::EguiSystem::ProcessOutput), ); // Register reflect types that don't come from plugins