From 18e807ae4251c516f69031712a5adc946a68f73d Mon Sep 17 00:00:00 2001 From: "Valeriano A.R" Date: Sat, 5 Dec 2015 17:56:47 +0100 Subject: [PATCH] Explosion and picking sounds --- code/CandyFucker.js | 47 +++++++++++++++++++++++++++++++------------- sfx/explosion1.wav | Bin 0 -> 6747 bytes sfx/pickcandy.wav | Bin 0 -> 6058 bytes 3 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 sfx/explosion1.wav create mode 100644 sfx/pickcandy.wav diff --git a/code/CandyFucker.js b/code/CandyFucker.js index 06663dc..7a95932 100644 --- a/code/CandyFucker.js +++ b/code/CandyFucker.js @@ -1,6 +1,6 @@ window.Images = new ImageLoader(); - +window.Sounds = new SoundLoader(); ///////////////////////////////////////// @@ -69,6 +69,7 @@ CandyEntity.prototype = { this.Game.GameScreen.AddEntity(frag); } this.GameEntity.Delete(); + window.Sounds.PlaySound("Explosion"); }, SetOffset: function(x, y){ this.GameEntity.UpdatePosition({ @@ -112,21 +113,38 @@ var CandyFucker = function(idScreen, idInfoDisplay){ this.MaxSwapDistance = 32; - window.Images.LoadImages( - [ - {Name: "Red", Url: "gfx/Red.png"}, - {Name: "Blue", Url: "gfx/Blue.png"}, - {Name: "Cyan", Url: "gfx/Cyan.png"}, - {Name: "Green", Url: "gfx/Green.png"}, - {Name: "Yellow", Url: "gfx/Yellow.png"}, - ], - function(){ - self.GameScreen.Start(); - } - ); - + this.LoadImages(); }; CandyFucker.prototype = { + LoadImages: function(){ + var self = this; + + window.Images.LoadImages( + [ + {Name: "Red", Url: "gfx/Red.png"}, + {Name: "Blue", Url: "gfx/Blue.png"}, + {Name: "Cyan", Url: "gfx/Cyan.png"}, + {Name: "Green", Url: "gfx/Green.png"}, + {Name: "Yellow", Url: "gfx/Yellow.png"}, + ], + function(){ + self.LoadSounds(); + } + ); + }, + LoadSounds: function(){ + var self = this; + + window.Sounds.LoadSounds( + [ + {Name: "Explosion", Url: "sfx/explosion1.wav"}, + {Name: "PickCandy", Url: "sfx/pickcandy.wav"}, + ], + function(){ + self.GameScreen.Start(); + } + ); + }, Init: function(gameScreen){ this.BuildGrid(12, 12); this.UpdateInfoDisplay(); @@ -380,6 +398,7 @@ CandyFucker.prototype = { this.CancelSwap(); }else{ this.StartSwap(candies[0]); + window.Sounds.PlaySound("PickCandy"); } } if(this.SwapDirection!=null){ diff --git a/sfx/explosion1.wav b/sfx/explosion1.wav new file mode 100644 index 0000000000000000000000000000000000000000..373fea7b10e0251a086dc9cb2a0fe9ad73ecb3b7 GIT binary patch literal 6747 zcmWIYbaM-qVqge&40BD(Em06)U|?WmU}SJv!vMyN3>*w8i6x2pQVf`2*Bvmp4F~@* zz_)i$@D>W*eFKB92=HVxI@k*~_RgIkZgp34RBz>#l;2l2{$)44-XGd zb|pGUQ3C;WWRL?l0nRAF02UY_5pW9xkOOsQZxnu-og#h^eO3T)S*14ycX zrir(2-@bWsWDOV~#c46r6fvkN;^LYyF|nv1(gy^5k$|f<9Oytm?KvGSS!9&(F^foF)+o^7gF;G*D&$2ZmtKbO{D7LO>20n0*ogU}^2}9yr(y z0?V_(0IsVGBnZa4z@QxDE#gP8`_vU|_L14v;1{xZ0^U`9gK%&up5@V zk?3Bu$nNOqm;*2Cp^WwG7kheodZB@SL{5jXHlin`%F4=?eoTN-B~G5)m5&KB5-|ZN zAklC)EE16DMVMgrbPP~~R!js221cOfJrHjeI8`7Mvyw1C2Sx&zG7$_WAc1I4bP!pL z0T4=H0q&3COh2T;#s^&I6wg8jRq5y;4_@*@8I{Owhb>z+Z{FMqiv>_g4Z=kgXmMH+ zgbq-P%K7sbEJp(kk&#g-06h~|<)VUYG?(Wi6&4`oOju+c7>xL_~{ zfq@dVlr{;R%n-yvR4@rG{wARKXU1em;R`3{uRw{s?if@MiVE_|P(T+nK427D&aXjH zTvmt{%V>pK(HvATc@hekIvW+tN6YaG&;WXwgWim-YeEIB=mjGz{GoINS}9b5+9IiM zL37U>q=pYT`ynSg5IYU65>2Z^12xsCpfU{&)Gb|t3MQd@vM3K7AkxjmiQtl|4b_tB z>gx0abkNd;4l>ak9~V~yPf~D38hTzyDh6ALLbQMb2Zg9dZM=bb(9#vz`4IP`7&c)J zdYfYL;>EQnhC?`M$;5$%xmW;t0SMx!$76!jjEsy7l-ym7UTDvnf+7#*^iM$t(=oKo z$_Fb&CUQ{=MKBMw)9a@lB^tG>P-Epyb>^?}@tf@gw@I;2{EN-a9bMJt2SE0GIhP%7_e zK?AMu^bBPn$HvT=GiUaL>P=)^gXY!}B)@{0$chUJ3Tjc+W2Vd-vYj0(_FNF}Q3O4RV_K&e|MbylH(>KYVKirT>{L#;SEP(!H!)}n&YMX1iG zL5;~KR38_jxT316aT+R^h}zESMT!bA6B>_j3dOSa_9}Sa8^UNsOA%1u!L5tqb9#qhZUbQr###nPLdVN)o8njJKwdh7vqXkh_X<=a@N=Z}!_dbl#jTUUZ zz4hp(R5c){HLx?=Kv@G7_klwhndrkTs2Wi-5t!EwHW7trLhraXG&EGBhet_CNhMmK zgSd4V>YCA_qO}dwZbre-(hG?~kp^=bF&u>+Whj0CahjT%T9C_72)h+CT)H4KNMsjC zKPqkkI|GGiM$Nfk9!mBEbL!CpptZFDRNtXtaIJ_$R8&+$0t8umGe+vDszA-gAYM6U zC5dKPMMXswEDa*)Hsq8BW;bG*geijTKnNR>yOF}G2}2i#N9s|78yl|)l)_LjS~(1I zGls#{7!h8Fp$5HPM6LF~yn2iTh#`RDw8q9p^dbYp{TR;2=4*Un4d4`pAR4eMhC2k! zh2Rv6Ai(}aA`mjQwRLsKyxQ7YXfFk3Vgs^tU0pp)oMIXy_6P`|#|i=E=+a2q0k-H2 AumAu6 literal 0 HcmV?d00001 diff --git a/sfx/pickcandy.wav b/sfx/pickcandy.wav new file mode 100644 index 0000000000000000000000000000000000000000..59f4b1cd791a7a12d9a1c18d4abddeceec15cec5 GIT binary patch literal 6058 zcmWIYbaPuI&cG1v80MOmTcRMqz`(%Bz{udTh5?Kj88{eH5=#>6#2FZl9@w>Y!|G)V z=ggSg-__PsTUlC|o0XOn9~~YN=ziM^dI4K)=d1-Y52 zN%7GUA%TA094rCBS(e4w6_wC%W ze$}#tb7xMO(9;1jskAUJD?K?OHZnXoz!zjx;F;rx_U_!We)Y0Nb7xMS*xT9KSXWgB zGAlJHJ|;3OIKbD-!__J1?1{tsc5U6TX2s(9vq4t2H#gK&mKNn@XTa5Yd$>6}o;!Ku z!0v6E)~#H+5Mmz4Z51VjaD^d(em0b1j)P3xxOT;o1#@Oho!Hye)>L0pQCgIr zlbM#B5E~s48XVx~?dj&?Gz+YB+s3sZLuXB!)Zg9S(pXnj4lxz1HY_;M-^a_{)w%pE z$N}3ouV1}<@q#%srcCVXYHw+%1t|s@oRSz96BQ0J*~iPn)ur>yi6i@WgH*3rvS9Aa zX_NYUI$E3RYbwh?W@o0QB*w=^MTCU}`ulo&y1P1`J9X^PzFpfkty={$9jv~yt+}DL zs-m>0AU7)`Ejckh2BaYEnm@@7}Rx!`hY07R{eMW9p>-9*~Z@>WZ@B z!n~ZU^i-&p&|r`yULI~4XHOnIxOeBaP3u>$Sh{c?OixQ=T}@?qX;DF5b|zR;Y;Ym3bcO^4`uq8KdwH%o zb^P#wJv+B;UcYALvc(`PL0Wq{+gq9%z)meL%+CesO-)Wrhy!U33k?Yl4Dk2$@%EZ? z>iCfZdv|T$0IQ_V;!}TmdqqytKHe0OXC# zj5Lr#65?Y)#zY{Qv*zTn!w2^6-m!J_hPA6#EL#jUXVQeep019z7La#psw&Gt&MC;t z&B@BlNKZ{kPD)IO1G^|99AXy8QFW(|A33;x&(7^zHmzT~3S!pmnbW6E20IF3SY1tZ zWkp$ONl_ulwCpU9_rS)*$AO#{1qvpRCxe3m1M^QEKYD2Y-d!NKty{Bl`BISMAO?b5 z*V*3I($v^cS6dBoUukhsVL^UgZZ^n;X{jkNL!qWdgolNNhJ*wM2dzDE?C`;Tdv?|%l4w70c1H#OGR)z(y3 zRg{;NmVk}V&&$op&H_6f;`XG(1dtVRu`wV!z?Oh*DL#4p$RV&5TQ_f9zjpP?{&CWO`SXm>;sS`t)QTR*is3#1{^*hd$O}KGc(fD)4(<*CnY7q?1}~379AB8 z6$$dy$>T>4AK15N*N$ylKtTnuYvKI4b7swiS=QUr)!EVB)(Y|yD9CE6t12tX!QLt^ zDl9C>&(F)v&B+FNEi)q{JuNLQ6%;keNf28T;^X7v;^JasK{m%kM@L6Ttvi17@WK6{ zFx(;DZxnkMU#fuis2Zb`o=Tjzw-O$_9 z4Rb_uQ)5GYeO)amQmZP#Apmv<#32Rw`T2Qyxw*MHIoY6~$jZ#j%*e>dNC&wG6e6i$ zH>H4G1#%WRbP~ZJAt4v)p4~gQZ`-nI<9e`zmM;Z`$^3b9X3v^A0~9JqP69^=C`OtZ z8yf2Cz^N>Fdva_|r zEI7UX*pb5r_wU=Yd*_aATQ`FO807dB%a<)#40Amwj3I#xiunG%-kzTBuCC6`j&_g_ zAYOp@p}r0r-XLFqy-`_NQBhG|US3{SRtEA5DC|p$L7)f>3LyaGDVV?VK_CwaaD0ZOr;NC&4`P@v45F@5^9sZ*y+o;+zHC|E$@0*ZWa zz;t$Wv_ld=YfDQ@GbnICDH#+zpzr|&5GXO!g2MP*3+6oGDP@qGCy{Qod8o;0)4CLB zP2lVbN;r+63J9EdKm<7bzzAqELZP5Z3J(QMX+xF5Tqx5J95ETNT Ql5G@^hQMeD4A~F>03j2)E&u=k literal 0 HcmV?d00001