From 83ff5a79fee5979ea5df39236fe8a10f04b636c5 Mon Sep 17 00:00:00 2001 From: heurtet Date: Fri, 14 May 2021 12:35:13 +0200 Subject: [PATCH] =?UTF-8?q?musique=20et=20bruitage=20rang=C3=A9s,=20cr?= =?UTF-8?q?=C3=A9dit=20en=20train=20d'=C3=AAtre=20fait?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/assets/sounds/credits.txt | 9 ++- .../arrow_landed.mp3} | Bin .../arrow_shot.mp3} | Bin .../player_death.wav} | Bin .../credit_music.mp3} | Bin .../game_music.mp3} | Bin .../mainMenu_music.mp3} | Bin .../resumeMenu_music.mp3} | Bin core/assets/sounds/sf_fleche_plante_01.mp3 | Bin 21395 -> 0 bytes core/src/sagittarius/model/Arrow.java | 4 +- core/src/sagittarius/model/Bow.java | 2 +- core/src/sagittarius/view/CreditScreen.java | 61 ++++++++++++++++++ core/src/sagittarius/view/GameScreen.java | 2 +- core/src/sagittarius/view/ResumeScreen.java | 2 +- core/src/sagittarius/view/SettingsScreen.java | 2 +- core/src/sagittarius/view/StartScreen.java | 16 ++++- 16 files changed, 89 insertions(+), 9 deletions(-) rename core/assets/sounds/{TOONTwang_Plante cartoon 6 (ID 1955)_LS.mp3 => effects/arrow_landed.mp3} (100%) rename core/assets/sounds/{SWSH_Whoosh 3 (ID 1795)_LS.mp3 => effects/arrow_shot.mp3} (100%) rename core/assets/sounds/{VOXScrm_Cri wilhelm (ID 0477)_LS.wav => effects/player_death.wav} (100%) rename core/assets/sounds/{bensound-house.mp3 => music/credit_music.mp3} (100%) rename core/assets/sounds/{HMO-MercuryCity.mp3 => music/game_music.mp3} (100%) rename core/assets/sounds/{Ghostrifter-Deflector.mp3 => music/mainMenu_music.mp3} (100%) rename core/assets/sounds/{Metre - Concentric.mp3 => music/resumeMenu_music.mp3} (100%) delete mode 100644 core/assets/sounds/sf_fleche_plante_01.mp3 create mode 100644 core/src/sagittarius/view/CreditScreen.java diff --git a/core/assets/sounds/credits.txt b/core/assets/sounds/credits.txt index a6ad470..d471b9e 100644 --- a/core/assets/sounds/credits.txt +++ b/core/assets/sounds/credits.txt @@ -1,10 +1,17 @@ MUSIQUE : -menu pause : +Crédits: House Bensound "Royalty Free Music from Bensound" : https://www.bensound.com/royalty-free-music/track/house + +Menu pause : + +Metre - Concentric +Attribution-NonCommercial 4.0 International License. +https://www.freemusicarchive.org/music/Metre/kinetic/concentric + menu principal : Deflector diff --git a/core/assets/sounds/TOONTwang_Plante cartoon 6 (ID 1955)_LS.mp3 b/core/assets/sounds/effects/arrow_landed.mp3 similarity index 100% rename from core/assets/sounds/TOONTwang_Plante cartoon 6 (ID 1955)_LS.mp3 rename to core/assets/sounds/effects/arrow_landed.mp3 diff --git a/core/assets/sounds/SWSH_Whoosh 3 (ID 1795)_LS.mp3 b/core/assets/sounds/effects/arrow_shot.mp3 similarity index 100% rename from core/assets/sounds/SWSH_Whoosh 3 (ID 1795)_LS.mp3 rename to core/assets/sounds/effects/arrow_shot.mp3 diff --git a/core/assets/sounds/VOXScrm_Cri wilhelm (ID 0477)_LS.wav b/core/assets/sounds/effects/player_death.wav similarity index 100% rename from core/assets/sounds/VOXScrm_Cri wilhelm (ID 0477)_LS.wav rename to core/assets/sounds/effects/player_death.wav diff --git a/core/assets/sounds/bensound-house.mp3 b/core/assets/sounds/music/credit_music.mp3 similarity index 100% rename from core/assets/sounds/bensound-house.mp3 rename to core/assets/sounds/music/credit_music.mp3 diff --git a/core/assets/sounds/HMO-MercuryCity.mp3 b/core/assets/sounds/music/game_music.mp3 similarity index 100% rename from core/assets/sounds/HMO-MercuryCity.mp3 rename to core/assets/sounds/music/game_music.mp3 diff --git a/core/assets/sounds/Ghostrifter-Deflector.mp3 b/core/assets/sounds/music/mainMenu_music.mp3 similarity index 100% rename from core/assets/sounds/Ghostrifter-Deflector.mp3 rename to core/assets/sounds/music/mainMenu_music.mp3 diff --git a/core/assets/sounds/Metre - Concentric.mp3 b/core/assets/sounds/music/resumeMenu_music.mp3 similarity index 100% rename from core/assets/sounds/Metre - Concentric.mp3 rename to core/assets/sounds/music/resumeMenu_music.mp3 diff --git a/core/assets/sounds/sf_fleche_plante_01.mp3 b/core/assets/sounds/sf_fleche_plante_01.mp3 deleted file mode 100644 index 202ffdd37e1f33b86bef0fc2fc7676ddfbd0edb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21395 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

g&$Vq zjgZ8LOcGXCY2cN^zZ6GAEc&}Ts5|&KB>+B8Y`-F1vo5fHMSn^?T-4n5-cxGA^{+N) zN`3XTVX$zrTk=kiQ068DRi0=#u%CF|StvkgO?L8&spMdGg$KN>^K)CNs74!k>8sEb zsrd6h7yo%`+w;T8k$5pYWmorzYvovlE4LN|~RI4qAL)HI*qC%I|Z|xkX zkP4kqXwJUCgPdZKI;_V{f5&5HoP%n$JeS00K)Wzd&LidS?t$`c#Za@A^Lqh;Ww8}e zDyLC_`|Q$WNkh`ppYDurcc>XPH0O66OILmc8WdA)kMHi6D{nJ%tG3(L{yQlB%ZvVD z&=AQRK%6~#blQ}*CSZj;C3_!mqrB0FWZdP+TJ)%*H|WQw_PXca?M@1S>xbS@|dL%i#RD{>6kb< z-o#{=oS^LjMqFrcUM#0DZQV&q0CHxTaX(OU1@DK+9-2{EvXrqdP?@8t%}$FEzXYsg zvP%@XaT_`yo{L$>D&2Z?gbw|O^vU8xxd5bU^X*jN#yj=2Fe35ims@><@9$r)xHf-| z-?&F=XDmwez|Hx8Jn@_z!GsH>&D$GGFAyykBgRAOLk>1ow(KMlC6ugS`epX;0rxb( z`+_K=cC7KKVeS*@#pdnt7rrbEU$^I1dXHR)qRxxnt3SoFa_(!u#1jjSTaviJ6G@t? z+I&iIe|&EQq`%gJimF(dZKQwBovoZqCHxlPkptSN1{_MJ2CpHCR@UU?#HDmfG4`B? zvUX1*wcpeGD%Pk@RxB2O_3#ULK7G|a;bpo(T>Sr5p??6X#*+VwK{~~Zly8TN;Icy6 zza-8JdrzzZjq#m`=<1N`fOiqzPc`ysMd2?WG*%LT$~lA+>~tfM11%%gAFXt~H|^Tm zV2s$~D37yUi>{YOvVX8H`z|@$68YP_`Z&DyQQRLbzdpA}e6EO@tPz?#0;h>jZ3|(0 z@}*sLRVpLA2X$9}j!?H{6kZ@To|uv0(~;IUM&YKqzqc~E$-WRvu++$Yzsj(TAbLX7 zGUaEf7z`0HuJpaZ@9&apf$KsRMBEOei)pa4?@gwQ|+wfsa&Gd%Pb_x$^=ZGvy?9$ z^&psh-5o@Ve&W7j?!-e%5t_AsAnl#oW>kxi_eJvVi8VA5TKqQM{n|8bqhm7iez;e? z)Q75Y<~99WFh#)4G}hM@E{x276Wu=mwc(G2SiMcNf3#7W4#|T_72W`{Ku$pW0UesL z!+}<4$!1WqP*2?Zhn5Dbkby=zPVm<^M2o5~Mv;_Kir187mZ69-P0(|OzhgbAX>mGN zpn3-2AyAQ9e$R(JpJP(;M04Wl?{jtPtvU8>8Eb0Vy58=gzYH`ZIKPS)H9Qw*0|WcH zkf;PpTB$HUpP!mb=*>1YtQ$Q$b*V1GizdP!C;0``m_B|oPtlafjtqYo69~XdzMcM& z^SDh+ID7N0jpo|=PCwu=?ZN-!R)^cA&{WZ6InPOGnohaVvMUS>+1?BUf{ZQNE7~KL z`T2;lM?3=w2xR1i7JGa0`F?_N@rItc*5Ki*(I=N^U;6Dv<)KK}lC+4UOGbaB52pFc6!EM`tSkbg9TfEz7mh0Vyq^!5u04ph$0OcoQRwIJ@$ zoPM?5o`N>ykK2E8 zXFk5(dv%%Y?&ALCL;p(LwahSVA@Qzu^zwH~6MF^j_vGk=lB2Gilu)yAZG2-3oSnb1 zpxE(ortO}Mmg~I0XSrE2{Pkm$W*b4XKCYQYdWF>s z`)E_30jN(rE53js2(#|ZXPHnjR_#E?jytr$9)gB zs;RHsMH%HOqq9b5S}yXpKEL^s_3F{l=r*5#$9C@$Kd<&=-%i-fC*7`8^X0)~_}ZSw z;Im%L?#AL55Iuac%Dg)PB*@Kih~pA5pM997C7o zG;hZ0_m*m0l!nm=WTbw55LD*V6jpYrWb&r26EV`z<7UMcI$)^x>D0i}k%zvKMkWDw z`;6@RXc}q+peC^^!)?+rn8oy+pDcb0YVm{{0HwBnHF8rkg7DoeP~%8xOkl z&~R=|v9b=;gGT-s6K6WKWO%qHWr{^wZA$>EmyW$f1i}Zhq7SJfqayA+SED}oz#*C3 zFEV}8Y!+8MzhipBN}XWSnZ{xO|5n&txmEW*P-#%+UwXFP z(S}3Hi9qULPfQjXdxf55Qgnb#lqV-epmJOrzmqnnsWv?9hw(`=>==6qdI=KDCZQXD zXZLNxr*FUKVHRU+LV8KKKdAJ)zh(js8#vTwa^r-*L` znX&lNFD-ujWwV}kZ-{+Y-|`GR_RlF)>&wZjv+IN*g`-67TO%Sgk+g~pYmm6@1XaJv z>6?8JSPVD2&S6i9G5$=I^X=h_x9%~^=Cag8`kJ~#7ju?+d*5T)QuLQ z&e+;GA=u8BU17d>lA^B5{MNLm`G&E^jhh!(G|4V)tB7GgzsG>+yQXqGrH>8z{$y<% z8?FAB3KX@fk(PLU0sBJ6$WBL+p^5MG_Q)T5-}%zEa8K%qT|-F`-fAc6kLrz0*EPd8 zs~X3G$IYl`loeQ0l>~$9q$NxIX@5YqH|{prrA2?8jjkZk{xms;wePA^_?cqK^t-7; zOZ^G4fSYPWFnJkH$7R@X^t#${R|lmpqpNJ?Ux!wIAN>AJp8sKx^B6z|_6?wqV7{5Z zB<{$L7(K%R*{XIckn>IA(2+S4f&j1#S0Q2rx2lWoBSLL`aG}7e04}D;HHkqZI~DEC z49!ha{!q=dHk*g0;zzo|l&izCD@~@*$-Ka?3dC+07wPK~ZVui1o2+X){7&DF!ATnd zFho-O>`!0jO&-Jd!7f~$MdqYpNl!x^#b3izWR5m#M&QX?9Z4(!dp1U<7 zt_0ybXM?plvouOv3%}=P5s{Q8Xv^%xaUst!j;U*zmw4$&3kF4^(%`*iEqYkELCJ{V z{j?$?^j2PX?6LPYvLx8$D(K&S(Fkb2evb`Ti=UumfIe0QV9@9K(zg+$k=n)CD-70R zNJZ;}{Bi8$3*e-wFJSp(FHT7tg>Kq^uwUrg_R3g@>D+FM3A(bXR@s^O!mcC2!>HiV zOK#p==aWy8#93?pOZyggl5jEMA)AY?s$^`FR*>^$+)aneeIS6PLKnAni%HQ$W~4)9 z^D$??{(|wS`Sc+-!erIgmLK%GeyZRggHYf;Yg{R$r94J$7=6RIkO?Z{rl&Q`Q%! z?3P9<8TaQ!z)KfelXF+9wzjV2A9MSgbG!nO62S|HNGzxZJ&xat%UHQA zVkQ9^4XIT;w4{-11(z4a*Y)GK^(H)>CyomlWA`z{4{_5S?7y_K+G_51jC5dBqc|}5XUw#8+G)+3FBv7%A7x@vDxBah53&fEqQ&0R=GI7T$_BU$YvnzF| zyd>s;9Eze{%--js9H{7h7co#JdD;!!OH9;@_5FECpY3uwup?^j+_Mv!>5UERn|dYA z9WJ%32%nEh)K0=>Oiv{o_G3m?N+zM15Lv_Xz+K1BKgkN^~TKTwi@Bv#xD^ zoS+&sf04@=&Be{weq=#ec)pNWXk)!3EtLDaaJ;kj+_pG47hJrS$Qj(pLwoZ_zVgnm zBXOGC{a%hY`nNQmNs;I zy)Kl(tDrl;iPto(ZNw$3}#QkDqcO?23~BJWIt_U>oyr@FF9NQRyLtr_KGlPJ4~ z#v<-H$>e9#ymbm3-luQx3{r?FXlCNG2qlp&waH(v8Si`!Zc-bC1xcwtzfv!IB~}9K zLDA&Y=6((gT)WPh9#L)N&t~n|RHg$jCH8710LD5T9Fi}QrwVi8q~rY0BGH-Dls3jWv^tVA zYSQgKd`53`;Rhw=98i+mL~9FA!Y4j19OT_cMjo0_fW+#IM5438x=qLaep$D8?w_%)2ZR$|wg24pxs-{2)M9HAPS2{{2KjHAr=k4uBC>PF$aT zH2zt&rss**TQaKu#1ZSrv|{&kTnby6d*+6dV>Z9g(vT|BPPtl<4*l=d>OTxhg_8;S z!~vr_asP|(4IoYjVswDrXjG#?U{G8uFD}$b9!!^sI1)|Vc-!GkEk>o*Vf-8-!qW?7 zk+}?$N8PfG&#>_e#k?zd#aFacB=@7c1{05(YZV7&m5Q{Oi2?_yU;JNLxr@4VJb(Vt zPq**c``Dy8oE@=PpB$TaENOYoD{i~woqcl6lSY)!@lnS4a6T2wZY#FUER%cEaytcceFoURj`3OlJE^VwoFofLojn-oWX66s`E5=L9*4qj#^%9 z?Xz91%aW-@A6Tnvm)OURiiUxqh_3W=J`NzB8mz76f9Su>^fy*ZG=#&u!mB0V6VlI_=K&Yya_owIMPfdhv z3!m2_h=+hml!~7M@osU)`H=WIyzl$mMiAEs!L7S~*kyB#kIPki_t(#l4}#(wNE*LY z>b_n$7)DLyMEQ?n+D z++)bbh$9?D?bmhWvphaZ`o_9s4!Pvao-?sY&!S`=ndbG3H@Ym;WlJe3h{sRMpDNhW z$s48;(c4hfu;0YraC?Y{KEm+7TSfiI@5iV;^*s#B_vR3}s9+|j*Xi~3xNoeC=@hkZ zlU#FKb=uvDS+(smd6|sA4YSg-mU;XAo%3n^B~+D)CKnUok!D=e=%l9G5=z&oXWNpY zqK9(icOKO0u(=NjQHf;OlU>*2MgLFt)*aN;w(dg}BP|dJO^8WAnn)J}m6FgxCm>a7 z=pqUV2uFGh-Oxl3q$GfV6hSzEVuSzzA@r(L6#*3yrHDuJ!hK%vxijy*|L@zgXMTJ3 zTC-+->o;Fp-+Vf2rEK~U_C@{El%DcOTdxM~MD)FmEgo3w4S%;jiyhk|@QS)r# zpW|9yk5E{1%!4nu=D9awk|^PuaG4}*kOb=NHDF&#ERm0Uji zP_#CyJUY?q9QaLO>BpGP(}5#Fb2JTX&+2@|>oAYO0pFtWyrBYiaUw(a;}v?)%LhBf$6u$1ZPb!R7DBXth#yuR7$Zv&xOtgl z{|WH|Z@pnhoy6AVQ*vKI^9eDkU=0%QDx(Y6Z-csXu7fiZW9!B9^SS?3n)TfAFX@(8TP%R>~n!! zPD6_%SI8Or49|C4?F5pl(R7H=?7jTOhlJawXe@d*`jrKhjW*HSe%H|jkEbud$KPjo z7P*$4>;&OPMWC-Dc`kq~7F5AbBiyCFNC%+Wm4Tcc^t0<(9Tgp7%QQfkwXIlk>JX%k zUaH<4lBf0KM^v`a95hxC?wZ`0#VlwQyBgFB&`zr)WBn=0nCXijQ>r2hGb~enR*sv^BEliE>m`z!m*mUJmW^bC)OvRXU z(Z-Kwo)rZB(TB#6wupUULhW;bwp;Fj3J=cHw$Ej_zI<08lN-g~oK7_84UhalCVeg?ro=V5n4GSp-C6r&MQUXV7n;?S&il}2eX`@!lX;ay9e8ZM?UqZcj-8P8%%9^X zGD7=IEh3z#x;6Q~8nFq%;;e{0Z!D~iQKG}s}f*Nqb%WE$bl z&6Rz*FRj6a%pmB(pL&UTK{a-9k%c`SPVGoHV^#E%L3B>DN7K~zW|D|QVQ#4Ukj(CW zmDx^2ZWyiaOuM+5rgH1LfnN?G3zu~{8}m4|V)%KM4W9$S<`mZr;AJ+eGt8sV zRBArx+mg_X=3{1@jgq-1%!n62>t!kpW=gH>&PUKd!m}nmTl^=yx8KmdK%UOcdcRHb zvk3b-hQwnA=g0a?iFzvix7AVQt0{e&-C(D+6u48VACenRZ1Ee>8C4-kU%CM!D zPnTM2Eona;l-p<9)ywf-A7h_G7lpd-x=&UW-v0dQQ_|X#VBd)LNFg=Vvws4&g$Bmj zx6y(%HL|E%nQs%1vcdo0B!Vm2mAY__wv?{TUe1)OTd?a|ZpFc;j>m&GFjZP8HO|1A ztDWPpwH4D`MRhAN7ecZCY{`F;sAw*^@2?;?{L92mn{~ybL^d7errZuq+~y#VD=#4F zveF!YK@j+@aPy5DvEzBf2QM`(+w!dR`juXjPRr({*Njiv>6_LjMR-TykTWs`lIY#= z=mqHrft|**^Fvf>8)jQ?9@6z-@UL$Pt~ufoBF=)sp>{S-;zE&L7+Y=;CZMfPkM$e- z$t;P@y?%p+{QVx!08vi4#afjBeV~1SbiV6P$u*Ta`V$vFm0FT)j;*~MY1G?esV2yv zwZ^}PlqIYXAe`~FOPxI1<5^YFYzj8r^|&&CnI(wa*HlS0nCfBKPQM4 z)!LR`0Ke;L>06kuQ2y{$IT5{N!>Ey;BRC@3hz&~Tuo&ZW0ZFW13X_WX~xUZHCg zJ-rmkT$gX72x(+D5G*%?HB=o%fY_!g9NcHH`ByrytX9|8#z^vy2Y2V6g}^J!@5^9w z(GoWm@Ue&##ed$D{=>@sBB&Lp&tj|ub3&i7WMvQ(b%BEmLFu~`;~WD@Wjc0?&xYHe zz*pR#B_8GM8gD4kW^nJpJkYrD{0EF3w%uZy?gmD=;a*SuD_aBH4t zUTVl-XW^ziwr6Q7>a64Y3){JZt_xccy8+_+X36sTylJKy)}FXYjQ-xLm#gLYl((;( zXRC7m?I%9B3v)ONu(F8Bh%7lV?@lraomqBw8fVbqTTZNMG7C88;IHXoeNW=1`75O^ zy9fF8cFd0}mBzdHHrVAa`T!Ka=lhTfwKx)B&`O}v`Fo0!1NmxA)Of`%V0kTTA*LHzBpLu?<|F!T!xoC zatn*58$g?uIjHvOR9v`-7Q#?gF=?ciH}k42UOrt(pbB7Uf{Zd`Ch`+vw40WX`8FIE z1u?8`6HLT)om&;Lmf8t!JaFl_F#_!0X!)lH`fcL+A$svf zjEX85!prIjK-bu?a~1m>&6JoW^QK+ZM(fA*FP2-cPBa}A=wXV?FG z^^!6{%exDcPOU7iO-u#`=GDZRu_34B!G_G8i^KLP_PEW;X<|CN2|m!-SwN7ZxUvQa zq}(Bw_i<4X!^FY3PLp7HsqVN=S!qZjN*5U{i_rHd4aZ>g^-AkiMfvn~oi6N9N}~Pl z6pGRuVTsve^Hv1`p^}oqF8=k`@CwITV~)V#H=6HwNE50KHn_}ds^RB?I|Et0TaKUA z8xXdA6o_DF-;Y|8)u^91hO8cS9!m8+(ta`oi6MeIcS@;VEW!Y?C$lIsvnaqo2P#Bm zR~9}|f1<_fV$!9jCaXDO!}o^?mn6gS=Dy~>jJLLP`67O0C1EAu?MlwF6=;!%7aAVB zY?KSLuNOi3jlwxH#96~ZCwaAXIIi+hIC5F!g$@b(SCB9&qRV0+-04yb0UQ#9%wXnZ zSNi6cxIb)b*ml?!okT9CpGf7sFmK6@QK=y6TyU@eYK5Nuzf zhf4vg@;ce(pe zkA9iBcZg?9I1y{dML{wv9H0YWA~MFH0Dx)?0Kh69Luh#U%-MNOM>5}#n@L(omRk1V zX+sYfeWp=H%@NUjgJ|c+4fc*jB8?5dnhjzh?a3qkmiGfBXC|-B~&# diff --git a/core/src/sagittarius/model/Arrow.java b/core/src/sagittarius/model/Arrow.java index 919b6af..b70c501 100644 --- a/core/src/sagittarius/model/Arrow.java +++ b/core/src/sagittarius/model/Arrow.java @@ -56,8 +56,8 @@ public class Arrow extends EntityQuad { if (!preview) { - arrowLandedSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/TOONTwang_Plante cartoon 6 (ID 1955)_LS.mp3")); - arrowHitSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/VOXScrm_Cri wilhelm (ID 0477)_LS.wav")); + arrowLandedSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/effects/arrow_landed.mp3")); + arrowHitSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/effects/player_death.wav")); texture = new ArrayList<>(); String path = "core/assets/arrow" + MathUtils.random(2); diff --git a/core/src/sagittarius/model/Bow.java b/core/src/sagittarius/model/Bow.java index 994068e..ed1e347 100644 --- a/core/src/sagittarius/model/Bow.java +++ b/core/src/sagittarius/model/Bow.java @@ -19,7 +19,7 @@ public class Bow extends Actor { private boolean aimAssist = false; private boolean pressed = false; private float angle; - private Sound shotSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/SWSH_Whoosh 3 (ID 1795)_LS.mp3")); + private Sound shotSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/effects/arrow_shot.mp3")); private Vector2 anchor = new Vector2(); private Vector2 aim = new Vector2(); diff --git a/core/src/sagittarius/view/CreditScreen.java b/core/src/sagittarius/view/CreditScreen.java new file mode 100644 index 0000000..f44d03b --- /dev/null +++ b/core/src/sagittarius/view/CreditScreen.java @@ -0,0 +1,61 @@ +package sagittarius.view; + +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.scenes.scene2d.InputEvent; +import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener; +import com.kotcrab.vis.ui.VisUI; +import com.kotcrab.vis.ui.widget.VisTable; +import com.kotcrab.vis.ui.widget.VisTextButton; + +import sagittarius.SagittariusGame; + +public class CreditScreen extends BaseScreen { + + @Override + public void initialize() { + + // A music is played + if (!SagittariusGame.disableMusic){ + + SagittariusGame.music.stop(); + SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/credit_music.mp3")); + SagittariusGame.music.setLooping(true); + SagittariusGame.music.play(); + + } + + Gdx.input.setInputProcessor(uiStage); + + // Table creation + VisTable table = new VisTable(true); + table.setFillParent(true); + uiStage.addActor(table); + + + + // go back button + VisTextButton returnButton = new VisTextButton("Go Back"); + returnButton.addListener(new ActorGestureListener() { + @Override + public void tap(InputEvent event, float x, float y, int count, int button) { + super.tap(event, x, y, count, button); + SagittariusGame.setActiveScreen( new StartScreen() ); + } + }); + + table.add(returnButton).width(150); + table.row(); + } + + @Override + public void update(float dt) { + // nothing (?) + } + + @Override + public void dispose() { + VisUI.dispose(); + super.dispose(); + } + +} \ No newline at end of file diff --git a/core/src/sagittarius/view/GameScreen.java b/core/src/sagittarius/view/GameScreen.java index 0cde633..432aa6e 100644 --- a/core/src/sagittarius/view/GameScreen.java +++ b/core/src/sagittarius/view/GameScreen.java @@ -51,7 +51,7 @@ public class GameScreen extends BaseScreen implements InputProcessor { if (!SagittariusGame.disableMusic){ SagittariusGame.music.stop(); - SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/HMO-MercuryCity.mp3")); + SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/game_music.mp3")); SagittariusGame.music.setLooping(true); SagittariusGame.music.play(); diff --git a/core/src/sagittarius/view/ResumeScreen.java b/core/src/sagittarius/view/ResumeScreen.java index ec86d66..5e5295d 100644 --- a/core/src/sagittarius/view/ResumeScreen.java +++ b/core/src/sagittarius/view/ResumeScreen.java @@ -25,7 +25,7 @@ public class ResumeScreen extends BaseScreen { if (!SagittariusGame.disableMusic){ SagittariusGame.music.stop(); - SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/Metre - Concentric.mp3")); + SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/resumeMenu_music.mp3")); SagittariusGame.music.setLooping(true); SagittariusGame.music.play(); } diff --git a/core/src/sagittarius/view/SettingsScreen.java b/core/src/sagittarius/view/SettingsScreen.java index ca30b7e..c10dfc4 100644 --- a/core/src/sagittarius/view/SettingsScreen.java +++ b/core/src/sagittarius/view/SettingsScreen.java @@ -20,7 +20,7 @@ public class SettingsScreen extends BaseScreen { if (!SagittariusGame.disableMusic){ SagittariusGame.music.stop(); - SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/Metre - Concentric.mp3")); + SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/resumeMenu_music.mp3")); SagittariusGame.music.setLooping(true); SagittariusGame.music.play(); } diff --git a/core/src/sagittarius/view/StartScreen.java b/core/src/sagittarius/view/StartScreen.java index 83f5344..f71b2b1 100644 --- a/core/src/sagittarius/view/StartScreen.java +++ b/core/src/sagittarius/view/StartScreen.java @@ -18,13 +18,13 @@ public class StartScreen extends BaseScreen { if (!SagittariusGame.disableMusic){ if ( SagittariusGame.music != null ){ SagittariusGame.music.stop(); - SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/Ghostrifter-Deflector.mp3")); + SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/mainMenu_music.mp3")); SagittariusGame.music.setLooping(true); SagittariusGame.music.play(); } else { - SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/Ghostrifter-Deflector.mp3")); + SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/mainMenu_music.mp3")); SagittariusGame.music.setLooping(true); SagittariusGame.music.play(); } @@ -57,6 +57,16 @@ public class StartScreen extends BaseScreen { } }); + VisTextButton creditButton = new VisTextButton("Credits"); + creditButton.addListener(new ActorGestureListener() { + @Override + public void tap(InputEvent event, float x, float y, int count, int button) { + super.tap(event, x, y, count, button); + SagittariusGame.setActiveScreen( new CreditScreen() ); + } + }); + + // Quit button VisTextButton quitButton = new VisTextButton("Exit"); quitButton.addListener(new ActorGestureListener() { @@ -72,6 +82,8 @@ public class StartScreen extends BaseScreen { table.row(); table.add(settingsButton).width(150); table.row(); + table.add(creditButton).width(150); + table.row(); table.add(quitButton).width(150); table.row(); }