From c28a0cb87f168dbf194f094a8f52242a09621967 Mon Sep 17 00:00:00 2001 From: rain Date: Tue, 14 Nov 2023 18:07:00 -0600 Subject: [PATCH] Added some more assets, started working on fixing hitboxes --- img/exclaimation.png | Bin 724 -> 4473 bytes img/mushroom-01.png | Bin 0 -> 837 bytes img/pip.png | Bin 7966 -> 8196 bytes img/pip_left.png | Bin 8409 -> 8648 bytes img/pip_right.png | Bin 8390 -> 8621 bytes img/pip_up.png | Bin 7914 -> 8146 bytes index.html | 2 ++ js/game.js | 25 ++++++++++++++++++++----- 8 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 img/mushroom-01.png diff --git a/img/exclaimation.png b/img/exclaimation.png index 41c93fa1aac1514d51afac31323daa31f8fb2b9e..e54b6b56386de3c1ff12cf63acca7bd04c5147e4 100644 GIT binary patch literal 4473 zcmeHLe{2)i9Y4n;u!NwHrKP3mb~B-E0_VH)@4LlNVjFCVgO|7?bY0N6pq$#7>28@)+%+fSVIdGa{t#;OI!g8=}&(Fs01)rNxblns4h1=|P=SW>gI_d!5 zA-Y@vpUZ{EWhpF15Qe4pZh6k>ee2=U!40*&o+bG$MNOvyFE8ER>G*p^$-b)B?s}}5 z`u%4GFIvjVjl0?#j~{<_@b#y5{-$qUUpsz7H*$HT=VQa-+hqCS?Vo=*@ZD=yomVgD zs*e8E^2U<9h9l8m6*tkle|(qz;K!aKeb-jpe5Px6PZ_)G;N}}QHZAyQ{mW;+Vs4(> zJBYpFE#-n@0L=Y^6^{RiZ(>vaCC zmbR5cO~;zSBq$@~qD!{epK1|9QPJxpm)zE*o0+>2S%X ztsj2%%(3!7vdLR>ZKvMH}{XZ zXCRJKVz5rB^RHofDQe^dDTIuvXk6RJ%H^pz$2TGc521Q7<}_UU!=DVeC^!x4tbWQL zccBK+yGcg1o2rBSrbeC-49l10SEg7Xh$4l|a*&6rC3UBQlvTDD8b8OToI)hu5xlAsabIv4A75{&o3JH`?K`1L`DVBgG_O8 zk~UIgG)hkPNGP5bAjwSVYdsRd);J<-P(o^!dE{w9F=f$Y3W3l1$D8Gdwj6;cQ3OQ+ znt)O1DMPB~GV7sAP%lQ~niq&Y1*wSP39+WkP3_T^GkGH5p5>i_9$&i#29)2=x+T6@ zou1F_G^pdVg2amgt2G(kjvOY7Ksc;sD`5#ac)}rs1j5eK_OOWyGo0NtiOLsCC|rz3 zDix3$Mc@hXye)*x0%3C?0Vo)na9FGsLI^Ru$sD$D9K%hbSSyPVm0V=`F3Rg<Oh*!*1_>?O;9$LN>5*< z^GkvlZv9_q_3+@8fQK#jiU~!MTQyVqMAf3E^j-QkB5Fqo$F)Pja(sFT39bbR+B|_P z-NiR>v3dmABNMLUcJXUM!OHU?tKG&CVcKGWPzY0m10kN^9A=&h+juKyu}@`BNMR+( z$!JAA=m=Utcxu06_(R%8l}|+{8<4sSAQ(Z@1mzeP%#sm|%q*BxbH@0JE6F=Fsnh_I zk_`BzZIHYm7n0dzn9)p4JKx}y*^6&*1fZT7WLo;p$TcI^v=o>YcqY1Lepw)w{d} zjI$M=-!uDC!JHz-&~N^7HJI*IJavjoimFfL*d6cO>)Pfm0MMI0_lltRB){<<{LkKJ z_FsAL;+T&PUcc;Xzt~^Y*tPAY@|GPZ$-scUZ}|hKD<9}QQ7}|fgAG4ixBA%Nz|uW? zy7vv1-28b@u<()d3t#L{{q6mM+g-1f_*+NzZ!R7FAoS#pr#m{V-OIvd9{Sjf;?j{slq zVm!;ArbawX991=)@`bF&D(5ZETBXKX_v9}O=k=9kuG1Vr5{p=Z1Q7~q zD5C-!F|C3^<=GBt~&1E6hFby|T>=KV(pm1+oe@v8l zOcaF|nx&)wrh%}Oe2Z~eDl0)liz)OeNvRr^vNbei@v6CT{V`D~n)1X&_c*4z#rP5r z2?=XJeauLTVtfgVl!P^!xJE6eO17b{kEvieBdHp2wMIzEN+T0FkQF@W!A(vuvyfvc wO2hB*3x?|q4F5^Be6+Dgw|3WnC9VMj08iUF3uMf;Z2$lO07*qoM6N<$f(N$~dH?_b diff --git a/img/mushroom-01.png b/img/mushroom-01.png new file mode 100644 index 0000000000000000000000000000000000000000..514e5b2182e565f0bcc6fa9a3179d191e9429b9a GIT binary patch literal 837 zcmV-L1G@Z)P)EX>4Tx04R}tkv&MmKpe$iQ>8^KB6bjQ2w0u$q9Ts93Pq?8YK2xEOfLO`CJjl7 zi=*ILaPVWX>fqw6tAnc`2!4RLx;QDiNQwVT3N2ziIPS;0dyl(!fKV?p&FYE)nr@q^ zL|n{dSH-|9dJ)6`fKi!Q#+)Q2(Q$m;!^hXVD9`GA?$6Pu<}3#IMB*4TOq+OvcxKZ! zIPVjOSy5Jr&xt2Yx*+i**Ah$rm8e0GW=!+&8SUy%F|H<)X_lxuFVT~qf|+uxkpyNXS1ZGbiE?O0c}jsbL4aaD#+HCk zo=34z6a>*Q3_)jEmLfb6F;O@nh$zC#(vSbdzd@`M;}Q23B_T#caC^9KJgOfZP2@W9 zfVXNAe49X~og*TI9+1hm)GX{tWbtstbRN!BqCyL$_J;2XlP#}CX$t{(Ng=<4++J}5)*@xem-dv~kv>}77Lnz=H~ zT_nKtw8zopB(>dIW%YX(u`_;27HbwV{<<^8i1GZ#QhxdP_ewUWf8UwEIQ-;Ho)4Wz z0+&gPePsLiW!ci=d+K}}7cCK(FWfI(;`qpY-D$o3g?bh`AI?me=yz7Qz2m5p^y%C) zU2R@At}X zpL{!S4#U6n2VU7fwM!G8P5u()%`MMZd;7rAQt!#%8&1n6yzrdPb8_Mzlhzu!3j4+R zr*xL`tL^N)?ZhKEQLd5d5XJy@SE@<&32>Gb;B;CH$M!+*K~MHTl{p=d;s)wKcN^sB`x& z5SNp3;yX7%=fmGar19a9eWuUh?V y^84T0Dpu!v&$AZ#z1+*(q0Z1~vL5H=tveW`oP3MQpI$U)00K`}KbLh*2~7ZHCtia9 delta 817 zcmZp1m}fWPotOy&gOP!ev6Z2Lm9c?>p`n$Dk(Hs*W){Zhy!En^w(~MDFg9m8I|q0= zJ1Z0v<)>xlq%ts6%&DDd>v7mY=4gDdtEMQcbw@|a3cs>I!Q)Y_N+BFuomTUyO|NsD z+@^B$XkdY^#gB~IhpT|@9sT**V-W?WJX%) zQAXeGXG@F}(~4Ioov+t+k~qrH#ButJ(K8iI*83kz`x)ZjC)u3-e`o$;|Fh9N934jr z(`J}`Wczq#S#H5S^}Y?0)(FiP_McJW_{e>ow%q@@4ah_+#UX#6%^jRHpTWq5xYc{QA%*xQU%|I0Sx!fznEQg z;DN3{)aR<~w~xOto(KqEDgEGqfP}tO(6?RZcUN0i|Nic?dcVA{WYP4yMlD7R47?Sa zTLik8l#Nr(j4h0lQgl;N4H9)tQp}BXEz>M4bWMzsQ<5!GQ!Fi#CmRZ{P`5C%FflYX zHZwM`FgH}5^EI3e*BmGsvnpPZHr{+}tddz`@d&$Ra=axtt*!qCZwS%as|uY4*`Nz zNnsl=q$(KHp8a;0t-spGW&6U*HcSi^hv(PGD`#0Zyjd7y|MZDgLS@12lKFowY*&p~ sw*IY=!0mFa`wTyio;dT%V})(Ec222J3HSA*PZ)r})78&qol`;+0Q6c(9{>OV diff --git a/img/pip_left.png b/img/pip_left.png index 2473da276b843d336ea3bdfeeba127169d025e35..1746b4fa1c066ce3caf8ca8049b6cfc846519984 100644 GIT binary patch delta 852 zcmccVc*1$Y1u-)Q1|tI_V=F^LD+3D!Ljx;QODhA@jnD4$avaHwdBVWJ*gE+vpKSfn zMWU?Q9Tq7o{K^6a3s;3|IJE|8Z+Vqa^itd;(<3NGhV^<=vwU|byLfu6Yz(X82j(MJ zk9uBo_4*SZlp*-|V4?lJyVZC0GPhLCT$$!B5@34T<7je{+HS3~y^Gixza)z_3mJdi znPS9v{$nY>eEfSQo72DV%wHUSawgA*&Le^K%cR9VvVHurY-#a5b-s;@mI%xj?w2lc zeB{3FwBG(gJqw)=XC_SaJ1gAYanworbncn1HZL1jnXr)FPpv(txt{Bu%i4Kr*7qm+ zJkPdFO7wgU(wtw?u@{>s?Lz$G1Gie1VTGoBA z|8aNi%=z_m3MMxhF8F+Oo4s4(y4VGQo8P`qzMVIR;a~a#uk4@Nr3ud_e~I$umS?QJ zec))R_vG&lr)3jfcuwazIq{E4YmHom{o?#nOw8LIzR$WHT`a$x-(l7+uR9Fv?FS+n zH(j^AC!6v9?S133|LPcaa1|ZeRiov`z#yQQ84^(v;p=0Syg5~%kx9ik%`nw4#Ux4B z%pf&I*Tl#?RoBAI)L1v!&@9c!z`(*NCCPj;m+*34OA|9Aa}zTYGjmf5!^!)EB^k{o z-w+NF07Y^LERuB%%qH82$YBU>&Jwx8G&x!+HiFYl3S>?y~48=n2| a6d8_dFD(mOVKy1)B?eDdKbLh*2~7au3u9FP delta 780 zcmV+n1M~dIL)k%)&=xcR05UK#GdeLaIx{dJF)=zcIXW;nvF6_m2vVS(xc~qGgOkk; z9e+hB6$Lwph-9cvc2N<>T7@E12(?114knj=L6e3g#l=x@EjakGSaoo5*44pP5ClI! zTwR0D=h1%rfRA zDFxs0b&mjF?_xa5|Jtj8+nEzVk{##;B}FAV4Pm1VBe z96=I`Sb_u*3Th~$0vj<}by6&(X+PoPA9no`xfF7h!N{?IDm2KhAN&t~cWV`P}W-&G`W?^GBEi_^|37+?ql9wx)DlZPNN4GJC*F$tbT zrSSj&0Oga#ATEE#A?jiJdvK5@Y1(^~&M{1C9;Kbf83&g~Y434H`g&mCvjpSt@F?*f zXB=K0CG2s=;ptJ_9%mxeqaWP6-pgEKV0iMRzMh$xbgL=VPif)FM5;r-%>6pyxgkQF zScj9UUrtU=PEKwB8y@HmB^6MrpIQOJ#4t<&t^gUf9v)0_F-$WL^CWW@NS>#^{zs1< zJ$m$re0j9u8#fIpRsa8ol)8k~Q(He}^ayNtj5aMtc;{jGbq@hEv!iU5lF5|-0000< KMNUMnLSTaI^+xUh diff --git a/img/pip_right.png b/img/pip_right.png index c704c6b01bba5b4bf67c43f46373caa06f4f8696..512bf0e7a6b53df45c42834b654b84a45184896c 100755 GIT binary patch delta 882 zcmV-&1C9K~L9IiO&=xiT05UK#GdeLbIxsjOF)%tcI65^mvF6VW2p#spga7~mg_FGw z9e>556$LAZIAo|!c2N;=s#PdLg;FcD>R@u|7c^-|Qd}Gb*Mfr|i&X~~XI&j!1wrrw z#MQ+~(M3x9Us7lhQGccz7V!r0^roeA-X{*RqNEU?6OS8oLE=ZQ z%PzlhE;uak%#e{z%@c=+#X=j)ZOn>>N<2jzR#c7hg^bGz=Pk}^xyqXN(i|qi@Or1Ghl;n%i4*AEysMnz~Bd00)P_Sb?(FJ>DH?@9p0+&HjD> zxC(N@x_l}|000mnX;fHrSWQeiW3yEdfdV8oV`4NnH8?UYFgRvmEi_{>H7#N@VlXW- zF=S*lV`gSGH)Lj$`VyxNIW#shH#0OdI59RhHIuFr838tv$P-i$F*-0fR536*H8?so zGc7PSlPnY-5HUJ1I8-q(IyE>tH8U+RHnUn3)B=-B7F{DSVPj=6GGQ$;W@Ke8G&3_d zEn;IiVl8DbHeon9GiG5pH!zdS7Dx~=EigD#F)%tcI65^nEig8-BNuB31dW1j$&->F zF@FmP5IQ!4#BlTg0087kL_t(o!|j(b4#F@DMdNgY3m_rifm3i0F2D`CGjRdVgv1f7 zN{leT9EPew3|2~7r&i*(WT?LCCnr|ooM9M-Q5_-tu6h6&QTBJRw6I^M^Tl-dU$Oih z2OXV-VW)*cg!PI#uq*{pDfG?r7{$rEAOR+wBcQ4m@p9$5g&+s z=U5+B$IUgp(5d;z_?BDysTx8*b#vz{ym;8vvhv46dC$WSyt1Zgazl#&00000Ne4wv IM6N<$f^6S)N&o-= delta 819 zcmV-31I+xbL&ian&=xcR05UK#GdeLaIx{dJF)=zcIXW^pvF6VW2yQ}SJ^%m#gOj}u z9e+hB6$Lwph-9cvc2N<>T7@E12(?114knj=L6e3g#l=x@EjakGSaoo5*44pP5ClI! zTwR0D=h1%rfRA zDFxs0b&mjF?_xa5|Jtj8+nEzVk{##;B}FAV4Pm1VBe z96=I`Sb_u*3Th~$0vj<}by6&(X+PoPA9no`xfF7h!N{?IDm2KhAN&t~cWV`pV`VovH8^H1I5RmiEi_^{;7+?ql{K0=plXoC7e+nKDF&%`S zaf|=}0OCnRK~z}7V_+BsqhJ(_f>AKy!2kcK^xy%EwDBlT>lg>x!%PDc^TQ^FN%a{0 zW1Mkt#VqXufKEwz;PdVvjbYjc5aZzTDD6GYNM8>OeAZzc9v&s$56j8P$;rv#b|?&dnfrCZb3@`CPN{yf zJ&emk7}2E)*c#cfQey*fl&`Xdi3bgqer+k5R%6Qc#^pbB+rxYP)hX^D86Y& xLrT^E{~@I=z4ed4hR0~ra)fsthF|v(0K=K1Y-8>$eEmr&=xiT05UK#GdeLbIxsjOF)%tcI65>kvF6_l2;r3#F#rGog_F$< z9e>556$LAZIAo|!c2N;=s#PdLg;FcD>R@u|7c^-|Qd}Gb*Mfr|i&X~~XI&j!1wrrw z#MQ+~(M3x9Us7lhQGccz7V!r0^roeA-X{*RqNEU?6OS8oLE=ZQ z%PzlhE;uak%#e{z%@c=+#X=j)ZOn>>N<2jzR#c7hg^bGz=Pk}^xyqXN(i|qi@Or1Ghl;n%i4*AEysMnz~Bd00)P_Sb?(FJ>DH?@9p0+&HjD> zxC(N@x_l}|000j@X;fHrSWQeiW3y!sfdV8mHeqHoW-?(dWHMwoEi^GUG%aCfHaIP2 zW;teJF=b(5IA$@E3KFLcIW#shH!?FbF)=kXGLya%838tv*b-C_F*-0fR536*H8?sn zGA%GRlROh15HUJ1I8-q(IyE>tG%_tPHnVCI@d1-~6kH@RHZwV6W@a@lH8MG7Ei^S^ zIW1y1WH~K2H#cH3W@a}zV>e@y_!LMGF)c7SR536*H8?snGc7PSvrrXl2n65=h7ps$ z9Wj3k2oO3e;KCd&0002oNklDDcS?fc#H8I%e7nr?KyLmi;aRG111P&sh=t6K{|6L9IEbZ}@3Gz<=Hg1&q-k+ioKM?201_yn(JWIX!TT7@E12(?114knj=L6e3g#l=x@EjakGSaoo5*44pP5ClI! zTwR0D=h1%rfRA zDFxs0b&mjF?_xa5|Jtj8+nEzVk{##;B}FAV4Pm1VBe z96=I`Sb_u*3Th~$0vj<}by6&(X+PoPA9no`xfF7h!N{?IDm2KhAN&t~cWV`pGB7hVV=^%&bKK8)J%n`pa6ve>jP$bq~$@CEBy41%7H^(pz`3L3-JGy02`om zaIgh>4-Pg#ufZE`(0T5Ad&Cf8?7FtqkH0Hm(uWZd5#J{|j?**@`#Lr8ukln4w!!0^ zsCImzla>QJu&~lV_uJ!=u5XW#d_2u3eb`$6P5W_mgNKinm46nJaPup4n@Ts5FOe3si00000NkvXXu0mjf=^ + + \ No newline at end of file diff --git a/js/game.js b/js/game.js index 9496d74..159cb01 100644 --- a/js/game.js +++ b/js/game.js @@ -11,12 +11,12 @@ var pHeight = 30; var ghostS = 20; -var drawHitboxes = true; +var drawHitboxes = false; function startGame() { pip = new player(pWidth, pHeight, 0 + pWidth*2, canvasHeight - pHeight-30); ghost = new fairy(ghostS, ghostS, 50, 50, pip); - enemies.push( new zombie(30, 30, 100, 100) ); + enemies.push( new zombie(30, 30, 20, 100) ); //enemies.push( new enemy(ghostS, ghostS, 50, 50, pip, "ghost") ); //enemies.push( new enemy(ghostS, ghostS, 50, 50, enemies[0], "ghost") ); //enemies.push( new enemy(ghostS, ghostS, 50, 50, enemies[1], "ghost") ); @@ -50,6 +50,15 @@ var game = { this.keydown = function (e) { game.keys = (game.keys || []); game.keys[e.keyCode] = true; + + // Enable Hitboxes + if (game.keys && game.keys[66]) { + if(drawHitboxes == false) { + drawHitboxes = true; + } else { + drawHitboxes = false; + } + } }; this.keyup = function (e) { game.keys[e.keyCode] = false; @@ -115,16 +124,16 @@ function player(width, height, x, y) { } this.iframes -= 1; } + ctx.drawImage(img, this.x, this.y, this.width, this.height); if(drawHitboxes) { // T R B L // 0 1 2 3 let hitbox = this.hitbox(); ctx.fillStyle = 'blue'; + ctx.globalAlpha = 0.4; ctx.fillRect(hitbox[3], hitbox[0], hitbox[1]-this.x, hitbox[2]-this.y); } - - ctx.drawImage(img, this.x, this.y, this.width, this.height); ctx.globalAlpha = 1; } @@ -326,17 +335,19 @@ function zombie(width, height, x, y) { } else { img = document.getElementById(`right_zombie`); } + ctx.drawImage(img, this.x, this.y, this.width, this.height); if(drawHitboxes) { // T R B L // 0 1 2 3 + ctx.globalAlpha = 0.4; let hitbox = this.hitbox(); ctx.fillStyle = 'green'; ctx.fillRect(hitbox[3], hitbox[0], hitbox[1]-this.x, hitbox[2]-this.y); } + ctx.globalAlpha = 1; - ctx.drawImage(img, this.x, this.y, this.width, this.height); } this.move = function() { @@ -457,7 +468,10 @@ function sound(src) { } var collision = { + // T R B L + // 0 1 2 3 collide: function (el1, el2) { + // Every case where there isn't a collision possible return !( el1[0] > el2[2] || el1[1] < el2[3] || @@ -467,6 +481,7 @@ var collision = { }, inside: function (el1, el2) { + // Every condition to be inside of each other return ( ((el2[0] <= el1[0]) && (el1[0] <= el2[2])) && ((el2[0] <= el1[2]) && (el1[2] <= el2[2])) &&