From 6fe1e9f177c8bec7afa5d43e8db25e1d68c9b1a1 Mon Sep 17 00:00:00 2001 From: milangames-art Date: Sat, 7 Dec 2019 14:32:38 +0100 Subject: [PATCH] add 1up, bullets --- SuperCbr.g1a | Bin 39828 -> 43276 bytes assets-fx/img/1up.png | Bin 0 -> 618 bytes assets-fx/img/brick.png | Bin 598 -> 4466 bytes assets-fx/img/dev.png | Bin 0 -> 864 bytes build-fx/SuperCbr.bin | Bin 39316 -> 42764 bytes build-fx/SuperCbr.elf | Bin 53932 -> 57480 bytes build-fx/assets/img/1up.png.o | Bin 0 -> 440 bytes build-fx/assets/img/brick.png.o | Bin 488 -> 488 bytes build-fx/assets/img/dev.png.o | Bin 0 -> 2456 bytes build-fx/map | 799 ++++++++++++++++---------------- build-fx/src/bonus.c.d | 6 +- build-fx/src/bonus.c.o | Bin 2412 -> 2820 bytes build-fx/src/box.c.d | 4 +- build-fx/src/ennemi.c.o | Bin 2460 -> 2708 bytes build-fx/src/keyboard.c.d | 4 +- build-fx/src/keyboard.c.o | Bin 1552 -> 1984 bytes build-fx/src/level.c.o | Bin 6952 -> 7664 bytes build-fx/src/main.c.o | Bin 2488 -> 2496 bytes build-fx/src/mario.c.o | Bin 3876 -> 3960 bytes build-fx/src/score.c.o | Bin 2088 -> 2084 bytes build-fx/src/tile.c.o | Bin 1632 -> 1712 bytes build-fx/src/world.c.o | Bin 3092 -> 3136 bytes src/bonus.c | 39 +- src/box.c | 1 + src/ennemi.c | 41 +- src/keyboard.c | 34 ++ src/level.c | 21 +- src/main.c | 3 +- src/mario.c | 59 ++- src/score.c | 1 - src/tile.c | 2 + src/tile.h | 2 + src/world.c | 13 +- src/world.h | 6 +- 34 files changed, 581 insertions(+), 454 deletions(-) create mode 100644 assets-fx/img/1up.png create mode 100644 assets-fx/img/dev.png create mode 100644 build-fx/assets/img/1up.png.o create mode 100644 build-fx/assets/img/dev.png.o diff --git a/SuperCbr.g1a b/SuperCbr.g1a index cc57f93c87ff6af1c9b795e969201e0a9468af20..54b5da4dfbfeb9896ff6686e82686876f8b16144 100644 GIT binary patch delta 7418 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 delta 5684 zcmZ`d4Nz0pn&;jGNDPoazyuI-F9->uxg`7xm_!s1Eb=2N+BSrM_}3~}7yD=&&_{zSh~L@40Vsqf&jc9YR5TzRoUN9iDHNdF*#`!JnO3 znD2h)eCOQredqhnJsTp2eoZERars}y&bvPF#xDIA{OA02X~}*l;7`;?7i`EYF%c?W*AOBRVuqV%HHiOXK4_jrN1u&}XJdq-u8CxLiTwpazCOet z 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 Ef~9ly$^ZZW literal 0 HcmV?d00001 diff --git a/assets-fx/img/brick.png b/assets-fx/img/brick.png index c5b34c87366bdf642caeed296d93b5bbe19e13f2..12451b7ce97716c905a4ee35450930efdc5e59ee 100755 GIT binary patch delta 4394 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 delta 498 zcmVtgRkgCm}(FKnOVl1BqiawzV6}U`(2D@d4J#gbM>h?ivd27 zc$OKaO}s%oy=fbq_lYB{D67Qh#A7BkNc_lkrO9uc3oZ*hGh(Jw^TZKivCzRv2eYE7 z5l<0ERZXXSA=6})^A=~VTxG33`3pliePx;JRKrMM5lfIDLO~TJlwl)AyH1LQ6rIOC z{6nr^B9}t05*RraP=A32+4Y0}!SC5x`N@f9QYa1tUL5CR1PJZ|jhf?pA3ILt1n@rt zS9;rDsRJ{gq}SS7^a$wR1}?7Knz9F6?f?T%hHT2NK1y4n~w<)FEhY!j7wE2|%%&>X9)^0wir51G?w& o**^2G`<9wOaXl<~cgs(|H&S&%3UZIgcK`qY07*qoM6N<$g7wbeuK)l5 diff --git a/assets-fx/img/dev.png b/assets-fx/img/dev.png new file mode 100644 index 0000000000000000000000000000000000000000..404e02ee16d51eb9a05d2ec0ffb710b66cee16ce GIT binary patch literal 864 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|?*?baoE#baqxKD9TUE%t>Wn z(3n^|(bnUzgUr$R=&hmJd}RWKCj#c`baYu{iFO4jUg276H6!L1tFP1~5pnl}TOT|) zo^>TF@5x?;rRr>n6q+ z?et1`65+tArE;AAAN&5@rk^JZ=LK2tmF&Cm?Kp?P9absR+yCsgy*}htM>$h%sA$VawZ%oW~lS=*_cNp2`mz#Y{(0v2>0f*!6CQ}Yh%Bzoe)sqb zqepP~N$Cd<1SE6=zU?}`+xhL@ztzib-siuyy(lZAY_lLRTG*1j-Cck*5d3uB4U8cM z&H|6fVg?3oVGw3ym^DWND9B#o>Fdh=n1_vvpTojCp$aG@S>hT|;+&tGo0?a`;9QiN zSdyBeP@Y+mq2TW68xY>eCk~8m3r`ovkcwMxZ(ZzbRuExzxbfrv{xf!46~#n?!y@K* z&N2yH_*E{z+Zkvc7=#J4f0;Swo8~J4Cyqqvi}JpTAvX&Yr*f|Jg8I$c(a){=3@uazFQhn^)qb zCT>lxVo7~kJuP?I#Ct_&-Zvu901aquA!>~2-XokJn(WHRa zE6#ksEgzh9_{4v9V~3R!esaaX?U&UxcF1)TXnRxBv-0OxrZrI(-H!Zv`@9{VSF?!m o!tCSz!}nl|e;_+75E!m~;%;qPP%+n1XAwxu)78&qol`;+05^eXumAu6 literal 0 HcmV?d00001 diff --git a/build-fx/SuperCbr.bin b/build-fx/SuperCbr.bin index a989bbe27a0b91918658a9117dde3e293b85b6fa..480ff1b699e6de604f8aca9630806473d160207c 100755 GIT binary patch delta 7386 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 T_jwb)*p2(waYhbEo3Z}~?+|$U diff --git a/build-fx/assets/img/1up.png.o b/build-fx/assets/img/1up.png.o new file mode 100644 index 0000000000000000000000000000000000000000..4164daa6792d250f4e91761bc4f15a9b4a0b5771 GIT binary patch literal 440 zcmb<-^>JflVq|~=Mg}b)8%coS16a-kOlmN&GO#c(G;l}&xphGN8;EBD@qH*?1xSPB z@BwCs`EWY~Abc*M9*}khC|?}G|NoI8J~KBx-mtU)&WKOVOF?joGpkY=81#xOb4wDF zfOJU_gwBAmitcaB lB?eBY7?1*k6+luI$_7y|^8|rxkX{%#3uGw6I6xY#4ggtZC2{}& literal 0 HcmV?d00001 diff --git a/build-fx/assets/img/brick.png.o b/build-fx/assets/img/brick.png.o index 42731c31a98642dce089843640b7ee8f9ad0a056..b7567da05cf53148fa66e779679dde4a79251dc8 100644 GIT binary patch delta 40 ncmaFC{DOHxjO2d?1_lsr1>)~Oyby>F199VIMMm|Fb9@*9?|urg delta 19 bcmaFC{DOHx4CBIymdcYg7-crj@nHl2OHBsE diff --git a/build-fx/assets/img/dev.png.o b/build-fx/assets/img/dev.png.o new file mode 100644 index 0000000000000000000000000000000000000000..719d196c546528e56d7163e5ed05426f57501f63 GIT binary patch literal 2456 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 XmvAQ0xFX^zySlrG&rl;=b-RB7z*ctL diff --git a/build-fx/src/box.c.d b/build-fx/src/box.c.d index 999ef47..489ee92 100644 --- a/build-fx/src/box.c.d +++ b/build-fx/src/box.c.d @@ -1,5 +1,7 @@ -build-fx/src/box.c.o: src/box.c src/box.h src/world.h +build-fx/src/box.c.o: src/box.c src/box.h src/world.h src/ennemi.h src/box.h: src/world.h: + +src/ennemi.h: diff --git a/build-fx/src/ennemi.c.o b/build-fx/src/ennemi.c.o index 341dce8ff6e8377d4b1ecc216c573cda36bdba01..0fd60fec4fa2ca033a4524f6c4b324d611821238 100644 GIT binary patch delta 1332 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 delta 797 zcmZ9JO=uHA6vy9Wr@NbOwb_cAU`?~DH5);3wwW>_0JvZYb82yq~PY=Y4?_U)6Kb{WnBq+|4Qpn!7)8!FG!Fr zlb`I9??y=k@jajm#ewYrp?v@ZxknrbY{UKz9qrIVo(}2&6!~Pw{`sBy1YFt~fGZt( z3j5%RHoS(4EJ;HwPs21lbFaWE)M3A=fpatg6y7nnbpTcH4*NxO|koB9vW~_xMPg z-ImR6={=TMK$qEqJU}eAEJtG&>L9u>K0dcNI!`{t1%S_D!%FnnISd9+D(EsgKg~7& a-}qC7NlB!KY*sP%(P_l9VguK$j{gA+goarF diff --git a/build-fx/src/level.c.o b/build-fx/src/level.c.o index c66bec7bf5915b3901cd09062342a0b067463705..cfb4d90db51bd97f117b5dca9c30f5e4c3a7d0e3 100644 GIT binary patch delta 204 zcmZ2s_Q86B5|d2AMio~^#?;AKjEanGlY1CtI7E9GIYe3*I46JP*JBcC+5CXfLuhh? zK=I^$7RkvEgd`>#u*(4H2o41X22lnen4G{WG5G)+$7BU&V^)R*3=E8u6`3_AZ(!n| z9L}_GG6%cDWDSvS#-)=DM6}qL8h|=HCMSrfu`x}6G8H%96j5YllA1I5k7N~-XwT#d nDJ3TH1(WAUsWFLfnS2CDNluykMoLXgMh2+G35a2U5ySuhw(>E^ delta 119 zcmexhy~1pQ5|iYNjVi8;jFFSG7!?^=CigJPa0ne?*dQdrz&ZINzaEp2$mR!(9zv66 zh;=hAp1eRzb@M`TMOG&9E0d4NR51x1nd~5|#3XWKa*C`PlgOLNJwQtA%;YVyYGRTh O3=9lTKnw$nAO-+RT^`E- diff --git a/build-fx/src/main.c.o b/build-fx/src/main.c.o index a911f5667c64d5f5b1f958e4d18fe6d6d7806f59..8f4a68b77474dce9cb1b4462a69a0aeedc74485b 100644 GIT binary patch delta 830 zcmXxhPe>F|90&04W0c&c$X$2M(wZDCO9WwyS}SvRFShAmmVt+0T-n*&ZT!2dbPzTu zNU^|r1syub=D~wtPzR5Cs#7?NYxEa0H@(`%;3ew4^gWp0?=!#m`2FTF^Cb%YP;`YnyFr=lHaDK4(!k^L|doqnyW0yKcCK}arW%|>F?)1>#S~YV%C@ap89J!Zi$YG@+$XaB4Mt;~G zPs@$s5T>(^;=yPP(t>qxoyUHZbDOom~$E<$5olm91-G z=cH^cOH%d}kL=r|DXD#{+ohfyUkJMbo{33c1s^>3D8BYg;%DZ@;%m|-9MmGEuiukF zLKdiBdO+ssJ4ttLVRsepLH;oa)gl@*7Mgn?ocqrDdCwjxCX$;ZD!oJjHpqT75Car)|_$uHM?f@LZoj{3j z7vL6-07b$*fJfK_N`(i2gThImj5)PjuE0-*7uj@79hHhLldW@I>soOZ8udbN9k~#U|lxxQ7-)8Ode)L`{ ziP$sVs0aUHJe5u2+qS83LdrQMNyG_~aRNkg`aKco2zKh`l~%X!xP z0mTJjD5hHY#9&3y$fR?a&MemN7mruD1C38+`~zOJyY4h+YJc)U;+wcd!T zYa^P@Zx>dT#>0cLJ~a^!>$)}wRgXor1b zk~@GRawp&uA;wY^TByu#ie}7Tw^3BX4)S8L co*m{*W^CadW}M~YV!hLR2F!2ue{6R63(&i}+5i9m diff --git a/build-fx/src/mario.c.o b/build-fx/src/mario.c.o index fbc97a990b5df73aa866588b0317e515c2385bb3..47d0df1b3a5389bfb918a63800d896bf7e050ab7 100644 GIT binary patch delta 1401 zcmaJ19RELex%AR&UfXSnec8PU7;u)&ah$j1&R@wxOKGDLjfx&M#f z|9AhF-`%yo&AxLAdh|*E=#bt%xkE!mTa7>LUEK6aHQuY#z#GyzN!GdJK6$W+YDkhn z`1ZrU(Z~<4$f{4|3%28|cA#)_kz|aUf80#U?;zQyuf_y$=&PzvLwRoUfyU$+eZ}M^ zYj58O;&hjdW%_b>O>AbcT@F1x|;+fwq1KTgs__DbFO9)4A)WBd-R>GyQoKY3cQ(V$SHC1z0 z+=Wg#Q*|%8<$yVxu85JC5N7n?`EBML$&#UvEfgsd_9aWD4qWH9^H7IMotT4vVng^o z;_$THPofPk*t@ds1~g9{8Vx`I=C?@Wz5ImWA5(?0YlzYJNu@Gz$nyV*9<8A=Bgw^n zZP=RW^VUp>oEUg@S&U4bd4R&q3q8prF}M#=mzo=ws+-Y{Jx7Pze{PF*yvGO0^sy`% zy8J=1R21bwt61bei!uLSth^BnQ$d?p ibcN749Cr;cZE^heR=8k>S$vD69^*&kc^!M)UH<@RO-Akj delta 1338 zcmZ8fO>7%Q82x6~cGp?_lXaTdO&WIBN!(3}3<2dE|2IN8Y|ha8%c1BXfhl>-M3J@jDcrMpcfN-Kn|RzejApDd6-X4cukh>=F$ z)7$sGZ{E)QF}OFl5ky;?L$O}NUgHE`4TL_!CJS|>v%pL8H(&gXrf1K{svvS@+c~xv zDzAKkB-uFq%jt}K8Oeg4jPu~sld4ceC41_5kts3yjLD_yKP5!&Spxsa1bwkGdf|M* z9Zbf^mrQ-G_GC(9gMmvI*(9IE;akS*mB@$eq2+?Chw&skjpp%nHZHtVL`76))JJ5% zlhrAl|Td$!h>Ckfm&w(5@GpKW}AjOa2P8{N*ly)6jGczhqy_6=Qrf8D-0; z2L7IhpB;Q|9wMDT)m>&t&~-_k{Z#Uoka1lWp5$lvY{6K|Fp^@djf)j-iPdvv9QAgs zAqF0xQD(M~Eu`}k12g<;%edNBUa^#`|5L7~^Vvdggh;QnjODg;*^(~dJ2uHP-{$5m z?gRYHHj-Ol^f@CfMG1Lsk=?u@MO9zXTj^8ZsClZMvQLWEJ(oR_Qg4Wg*smwzyu#@3 zZMA1-G$SD?+9hdB5f-$~#dfb)30b|t|MsQ}V*mU3=V*3aVcs0boQ=b;5OJ$`%5fy8 zo{d4c>xUzeSB3-nM4Z3M5$AE@95E`k1;R z1{B60$!OY`q$t9fk&l}fn-`kP&86mI6ZrE@^Ukw)f=lxLcU6AhHOlBNN!#zr7OZ<7 z{!>3zNBiWZ5zD7!w2zFoNn`tu6#*Jh^+KZsPP}6m@jZJ_ulWWV;AtIJAgD#~-KL`( z9Ul?^5czP5Y@4~e0qmrv$)3YQTyD5Z&;?8Nl;HOA9+sB?%mir)->q`}Y%T%7nP%on zk|#!S3V^pT+UaP}Ez(Z;JpdQQUjeu&zC+GS@z(%eioXTurucgRf#94u7v1X&M)v`H zmWT-h9JMf8>>P-_*)d`_0Q#tA3&2nDcE^(?0RogK0cc=$kIbiOSd!ov6_Eu04kiiu zDgRw3nZpk-VDXNDj>a+6`74eS0LQ83WM{C01RHGgZvi;SZM;fFF#wU`B!EQm9Dq!* zN)CZbt{s%cC)`2%dGZ4faLOG-+j!L-LX&vMJ;FGC!}kx%?`HW6_jp3+CZ6utZ>jGUJqqD)rW4`fV5auJNS{Wh7taOD;}IN(fF2GS+y+W2|}^=lXyxIjW6 zuz`U=0LI?Jz`zG%?_glyhq4)g>S5xHK=mRpaiDrp7#pab6~^9!FrV=N!hFUf5Hmq8 zVPHIgq~Qz$120VT1tjr13=Etw@drraPZ$`)VB#+r7{p=hHw+9CF!l!q21ywE2Ll5K zgsoRxnL9a^kbtqjFfd5M z*nb!pI3R4j;>z5~zHF^bObnB+uqiX%nEZoHozY~n0=qh+!(13K(jD`~oET3N-n4Ain`gz8Ot^ zB9K1;Nxm0FKA3@FI#6H%l7e|C3K$sH0{I(|Ok@et2!$%e3=v`u_?2H{Jnp&2Ai_z10V|?O+Ypy5HkP(OZ+o| delta 418 zcmdnM`+#SH5);dXi7MweGc!ss)>|?#Fem`AfFJ_{Gmtg~VlWVZP_97A0El7oju2s> z0EFQWq#S@4ChrXqhReqQ`2k4s5vcO@44FWI1SAEis0tWLfcyd^c@P^6pbn@5avFdb z=71`&BuD_lXaQ0aKwPK?yCK3*d1D5KSwMjWND8K*C}3b%3gmAsfkn$@d3Gq3L+8tRLRVy`w16Dn)&bl zKlA79zWLsH-+9%?>};IaC|{cOMuqY-k7d4FXS3YRBJe3zxubr$&eT|G=H@u?+QrkJ zy0tB4reb`ImtE?bGSv`UYiSZ<-xL;ZDHXM(eJ1gzJyjvYsl^!ohZy4$%D;>=Azd%8LrMZb5i88|Ju(PM=U7kRvD%A+ee;U zk~hZLxf$w6%* z<#_Ct0<{TWFjVY7YvNx*euEINjv*m45*nq1s?6rMz_;AwBI_2NTk9cjXmaaOhY@== zAg^-aGQb}6dSC$%dwb};p4bBs3{#9%3!)m9j;QOQ%JNK0PLt<)YW}9*%d7s$a7~tY z?L|~}8ddgclCE-HS9!F78i&{zzbm%JWu8{5F7239)|19ET#Ro&9|TuxBu!Lt;nr65 zxLG@jw>$WRpbv>YDmW;1Iw)J)N~LU?^?%%5?B=>4WV^sGQ|7qtqJM?HhrWqU?WzGD zT4%lF9v5PG@`QU`pdYu6Lop()tF-(+1%-=9Sko#tz{Vvu;1_2mce*xg0 zl6~{3Q>GKR9Wsvp1~5f1!)ok%cz0m7gUATveE**#g_T4m4e``cKA$TfNUr2crKJLy zvs~~bmkKMT_(CzU3h{+pX*r)*i>C{P^e4Iar-@`fO|~sxms$J-i%tWLy#eq7#hU;} zDETb{N#|F z$qC>x&P`(g$0+sy^iw>2nA3+p(`lUd1pr1V4g**zp2j3M-QeFIr}#C1;}l0pcHk28 sHhDVW>%#_2mJA6#=5w;#H$r9w8zM!JF|K30LT+Q+COa5!d}kf{2el<{9 delta 1264 zcmaiyO=ufe5XWafEbVF)uRi>-YT{Tc8B0!_NV1^VAqQC$RA@s|C?t>;uVf3!sgPA0 zwU`n%Y$35xRato{4J`$?zT^<_!8x>-l4E?_6;%uA!Gcl+8j7Gn^blxgB`xux&DEU;4T0-5Q-|zAXX2Oe+WaH(OMdmKSz^2j2KP z=C3(hVlJNIQ+&v$-&f*?V)K5MMCe6fWlz!cyT%tXAM;m)9HZ9{#S|Z*Q~Z(GtcUn4 zF=LGFv?k9OpJOI_3nHF2=y$TDSy9c+v}S0H?SOACTDj8LlIOQ4GT!!!o1jH0-}yXCOT`V2{|DLeI+{ViTi8xf>YiMdzLk2{)t#Sqr{(d zo))WI3-pgN@t{Ci$m*6&eTYs3wIz$Y&>=3>!pT93`SDmP49 zb7l#4`DBhs@rUA|x3eLB(0#8lZFaxrH1}KBeS9M>d?8cEUWmgu-HS=~b4=QL?__1r9BR|s7w>!`Q@gIO&XgeYdhBELa^hY>v;oQZ!gY)=!RWu0sE_uep$pm{* zv@0InUiv%1z2pAyXwgkBveH3;{ez;0$u-*@>ML?&3%WH-^tuOtLjMB*^F0}{pFhuZ za2Xza{tJMWFv2-lBWHiOdX5?;CHtS_neyt!###}Uisf`J3rovug~DnvOUm3;@(VZ4 zuNBK1ODpT?kI8fHw#qmGIP*>%3?@He=~Dp1mYxC-Ej`TfPFfn{ zotDP<2}?^@@o8&;6;E2)PwqKBrKX4^1c&ed^&UwGLFyXW85$>_2rg8g2_dwP&=$zA UXde>R85+f^;6ksazUk%r7YE=wjQ{`u diff --git a/src/bonus.c b/src/bonus.c index 7538243..07d3b59 100644 --- a/src/bonus.c +++ b/src/bonus.c @@ -3,6 +3,8 @@ #include "mario.h" #include "world.h" #include "tile.h" +#include "score.h" +#include "ennemi.h" #include #define BONUS_FLEUR 4 // interne, généré depuis champi @@ -38,7 +40,10 @@ void lance_bullet() bullets[i].type=BULLET; bullets[i].b.x=mario.p.x; bullets[i].b.y=mario.p.y+8; - bullets[i].b.vx=4*last_vx_sign-2; + if (last_vx_sign==0) + bullets[i].b.vx=-3; + else + bullets[i].b.vx=3; bullets[i].b.vy=0; bullets[i].p1=last_vx_sign; return; @@ -53,18 +58,32 @@ void bullet_display() { box_jump(&bullets[i].b,4); box_move(&bullets[i].b); - draw_tile(bullets[i].b.x-world_get_real_x0(), bullets[i].b.y-world_get_real_y0(), &bullet, 1+sgn(bullets[i].b.vy)/2, 0); + draw_tile(bullets[i].b.x-world_get_real_x0(), bullets[i].b.y-world_get_real_y0(), &bullet, (1+sgn(bullets[i].b.vy))/2, 0); if (bullets[i].b.vx==0) - { - bullets[i].p1*=-1; - bullets[i].b.vx=4*bullets[i].p1; - } + bullets[i].type=0; if (bullets[i].b.y<0) bullets[i].type=0; if (bullets[i].b.x<=world_get_real_x0()-bullets[i].b.w || bullets[i].b.x>=world_get_real_x0()+127) bullets[i].type=0; + for (int a=0; adiscovered && t->type!=NONE) + { + bool x_collide= (bullets[i].b.x<=t->b.x && t->b.xb.x+t->b.w-1 && t->b.x+t->b.wb.y && t->b.yb.y+t->b.h-1 && t->b.y+t->b.htype=NONE; + bullets[i].type=0; + score_add(100); + } + } + } } + } + } @@ -129,6 +148,12 @@ void bonus_move() //+collision mario_has_bullets=1; score_add(1000); } + if (bonus.type==BONUS_1UP) + { + bonus_set(BONUS_NONE,0,0); + score_add(1000); + lifes++; + } } } @@ -141,4 +166,6 @@ void bonus_draw() draw_tile(bonus.b.x-world_get_real_x0(), bonus.b.y-world_get_real_y0(mario.p.y), &champi, 0,0); if (bonus.type==BONUS_FLEUR) draw_tile(bonus.b.x-world_get_real_x0(), bonus.b.y-world_get_real_y0(mario.p.y), &fleur, 0,0); + if (bonus.type==BONUS_1UP) + draw_tile(bonus.b.x-world_get_real_x0(), bonus.b.y-world_get_real_y0(mario.p.y), &life_1up, 0,0); } \ No newline at end of file diff --git a/src/box.c b/src/box.c index 821911b..740826e 100755 --- a/src/box.c +++ b/src/box.c @@ -1,5 +1,6 @@ #include "box.h" #include "world.h" +#include "ennemi.h" int sgn(int x) { diff --git a/src/ennemi.c b/src/ennemi.c index e14ffcc..503b2f5 100644 --- a/src/ennemi.c +++ b/src/ennemi.c @@ -29,30 +29,29 @@ void display_ennemi(ennemi_t * e) bool ennemi_check_collision(ennemi_t *e) { - if (mario_immunity) - { - return false; - } - else - { - bool x_collide= (mario.p.x<=e->b.x && e->b.xb.x+e->b.w-1 && e->b.x+e->b.wb.y && e->b.yb.y+e->b.h-1 && e->b.y+e->b.hb.x && e->b.xb.x+e->b.w-1 && e->b.x+e->b.wb.y && e->b.yb.y+e->b.h-1 && e->b.y+e->b.hb.x-e->b.w>world_get_real_x0() && e->b.xb.x-e->b.w>world_get_real_x0() && e->b.xdiscovered=1; if (e->b.x+e->b.w<=world_get_real_x0()) e->type=NONE; @@ -68,6 +67,7 @@ void move_ennemi(ennemi_t *e) ennemi_t* t=&ennemis_global[i]; if (t!=e && t->discovered && t->type!=NONE) { + bool x_collide= (t->b.x<=e->b.x+e->b.vx && e->b.x+e->b.vxb.x+t->b.w) || (t->b.x<=e->b.x+e->b.w-1+e->b.vx && e->b.x+e->b.w+e->b.vxb.x+t->b.w); bool y_collide= (t->b.y<=e->b.y+e->b.vy && e->b.y+e->b.vyb.y+t->b.h) || (t->b.y<=e->b.y+e->b.h-1+e->b.vy && e->b.y+e->b.h+e->b.vyb.y+t->b.h); if (x_collide&&y_collide) @@ -75,6 +75,19 @@ void move_ennemi(ennemi_t *e) e->b.vx=0; e->b.vy=0; } + int sol=0; + + for (int j=0; jb.h; j++) + { + gift_t * c=world_get(e->b.x+j ,e->b.y-1); + if ((c->type==GIFT || c->type==BRICK) && c->time_hit_id) + { + e->life=DEAD; + e->p1=time_id; + score_add(100); + } + + } } } @@ -108,9 +121,9 @@ void move_ennemi(ennemi_t *e) e->type=NONE; if (ennemi_check_collision(e)) { - if (mario.p.vy<0) + if (mario.p.vy<=-2) { - e->life=0; + e->life=DEAD; e->p1=time_id; score_add(100); mario.p.vy=4; diff --git a/src/keyboard.c b/src/keyboard.c index 905f5b6..5b9da3a 100755 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1,5 +1,6 @@ #include "keyboard.h" #include "mario.h" +#include "score.h" #include #include #include @@ -10,6 +11,8 @@ mkey_t keys[6]={0}; extern image_t img_menu_pause; extern image_t img_select_arrow; +static int konami[]={KEY_UP,KEY_UP,KEY_DOWN,KEY_DOWN,KEY_LEFT,KEY_RIGHT,KEY_LEFT,KEY_RIGHT,KEY_SHIFT,KEY_ALPHA}; + int menu_pause() // 1 exit, 0 continue { key_event_t e; @@ -36,6 +39,37 @@ int menu_pause() // 1 exit, 0 continue choice=1; if (keydown(KEY_EXIT)) return 0; + if (keydown(KEY_F1)) + { + e=pollevent(); + int a=0; + while (a<10) + { + if (e.type==KEYEV_DOWN) + { + if (e.key==konami[a]) + a++; + else + break; + } + if (keydown(KEY_EXIT)) + break; + if (a==10) + { + mario_bigger(); + mario_has_bullets=1; + lifes=50; + extern image_t img_dev; + dimage(0,0,&img_dev); + dupdate(); + sleep_ms(3,1000); + sleep_ms(3,1000); + return 0; + } + else + e=pollevent(); + } + } e=pollevent(); } diff --git a/src/level.c b/src/level.c index 2847889..378b40f 100644 --- a/src/level.c +++ b/src/level.c @@ -147,25 +147,38 @@ void set_level(int n) {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {NUAGE,0x11}, {NUAGE,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {NUAGE,0x21}, {NUAGE,0x20}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - + {EARTH,0x01}, {EARTH,0x00}, {BUISSON,0x00}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {BUISSON,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {BUISSON,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {BUISSON,0x20}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {BRICK,0x15}, {0,0}, {0,0}, {0,0}, {GIFT,0x11}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x00}, {COLLINE,0x01}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {COLLINE,0x11}, {COLLINE,0x01}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {COLLINE,0x11}, {COLLINE,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {COLLINE,0x11}, {COLLINE,0x21}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {COLLINE,0x21}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, }; lvl=&level_0; extern image_t img_lvl0; w_fond=&img_lvl0; - w_current_x=89; + w_current_x=101; w_current_y=13; mario_x_max=0; mario.p.x=25; mario.p.y=16; init_level(lvl); - ennemis_global_size=4; + ennemis_global_size=6; ennemi_t ennemies0[]= { {GOOMBA,{176,16,8,8,-1,0,1},-1,0,1}, {GOOMBA,{321,16,8,8,-1,0,1},-1,0,1}, {GOOMBA,{409,16,8,8,-1,0,1},-1,0,1}, - {GOOMBA,{419,16,8,8,-1,0,1},-1,0,1} + {GOOMBA,{421,16,8,8,-1,0,1},-1,0,1}, + {GOOMBA,{640,72,8,8,-1,0,1},-1,0,1}, + {GOOMBA,{656,72,8,8,-1,0,1},-1,0,1} }; init_ennemies(ennemies0); diff --git a/src/main.c b/src/main.c index 3379a87..0fdfd1b 100755 --- a/src/main.c +++ b/src/main.c @@ -57,11 +57,12 @@ int main(void) { mario_dead=0; end_level=0; - mario_smaller(); + } if (end_level==0) { lifes--; + mario_smaller(); set_level(current_level); extern image_t img_new_level; dimage(0,0,&img_new_level); diff --git a/src/mario.c b/src/mario.c index 7565ceb..ca88fe9 100755 --- a/src/mario.c +++ b/src/mario.c @@ -52,10 +52,14 @@ void mario_bigger() void mario_smaller() { + if (mario.size==M_BIG) + mario.p.y-=8; mario.p.h=8; mario.size=M_SMALL; mario_has_bullets=0; - mario_immunity=1; + if (mario_immunity==0) + mario_immunity=1; + //mario.p.vy=5; } void mario_draw() @@ -110,7 +114,7 @@ void mario_move() if (mario_immunity) { mario_immunity++; - if (mario_immunity==40) + if (mario_immunity==60) mario_immunity=0; } @@ -220,29 +224,38 @@ void mario_move() if (t->type==GIFT || t->type==BRICK) { brick_t *c=(brick_t*)t; + if (c->time_hit_id==0) + { + if (c->content==1 && c->number) + { + c->number--; + score_add_coin(); + score_add(200); + c->time_hit_id=1; + } + else if (c->content==2 && c->number) + { + c->number--; + bonus_set(BONUS_CHAMPI,((mario.p.x+mario.p.w/2)/8)*8,mario.p.y+mario.p.h+8); + c->time_hit_id=1; + } + else if (c->content==3 && c->number) + { + c->number--; + bonus_set(BONUS_1UP,((mario.p.x+mario.p.w/2)/8)*8,mario.p.y+mario.p.h+8); + c->time_hit_id=1; + } + else if (c->content==0 && mario.size==M_BIG && c->type==BRICK) + { + c->state=1; + c->time_hit_id=1; + mario.p.vy=0; + } + else if (c->type==BRICK && mario.size==M_SMALL && c->content==0) + c->time_hit_id=1; - if (c->content==1 && c->number) - { - c->number--; - score_add_coin(); - score_add(200); - c->time_hit_id=1; + c->hidden=0; } - if (c->content==2 && c->number) - { - c->number--; - bonus_set(BONUS_CHAMPI,((mario.p.x+mario.p.w/2)/8)*8,mario.p.y+mario.p.h+8); - c->time_hit_id=1; - } - if (c->content==0 && mario.size==M_BIG && c->type==BRICK) - { - c->type=0; - mario.p.vy=0; - } - else if (c->type==BRICK) - c->time_hit_id=1; - - c->hidden=0; } //} diff --git a/src/score.c b/src/score.c index 1a2ba15..e48ee18 100644 --- a/src/score.c +++ b/src/score.c @@ -48,7 +48,6 @@ void score_add(int i) return; if (time_id-combo_id<=12 && time_id-combo_id>=0 && combo) { - i*=2; score+=i; combo_id=time_id; combo+=i; diff --git a/src/tile.c b/src/tile.c index 287a97f..00779c2 100755 --- a/src/tile.c +++ b/src/tile.c @@ -30,6 +30,8 @@ tileset_t bloc={&img_bloc, 8, 8, 0}; extern image_t img_champi; tileset_t champi={&img_champi, 8, 8, 0}; +extern image_t img_1up; +tileset_t life_1up={&img_1up, 8, 8, 0}; extern image_t img_fleur; tileset_t fleur={&img_fleur, 8, 8, 0}; diff --git a/src/tile.h b/src/tile.h index 11d5b0d..aabf50d 100755 --- a/src/tile.h +++ b/src/tile.h @@ -24,9 +24,11 @@ extern tileset_t colline; extern tileset_t champi; extern tileset_t fleur; +extern tileset_t life_1up; extern tileset_t bullet; + void draw_tile(int sx, int sy, tileset_t const * const set, int x, int y); #endif \ No newline at end of file diff --git a/src/world.c b/src/world.c index cc4eb17..ccc28a7 100755 --- a/src/world.c +++ b/src/world.c @@ -63,11 +63,13 @@ void display_cell(int cx, int cy, int sx, int sy, int plan) sy+=2+(i->time_hit_id-4)/4; if (i->time_hit_id==8) i->time_hit_id=0; + if (i->state==1 && i->time_hit_id==0) + i->type=0; } if (i->hidden==0) { - if (i->time_hit_id || i->content==0 || i->number) - draw_tile(sx, sy, &brick, 0, 0); + if (i->time_hit_id || i->content==0 || i->number>0) + draw_tile(sx, sy, &brick, 0, i->state); else draw_tile(sx, sy, &gift, 1, 0); if (i->content==1 && i->time_hit_id && i->time_hit_id<=4) @@ -78,7 +80,7 @@ void display_cell(int cx, int cy, int sx, int sy, int plan) if (cell->type==GIFT) { gift_t* i=(gift_t*)cell; - if (i->time_hit_id) + if (i->time_hit_id) { i->time_hit_id++; sy+=2+(i->time_hit_id-4)/4; @@ -152,7 +154,7 @@ int world_get_real_x0() //mario delta en 0,0 return min(max(mario_x_max-54,0),w_current_x*8-128);} int world_get_real_y0() //mario delta en 0,0 -{return min(max(mario.p.y-32,0),w_current_y*8-64);} +{return /*min(*/max(mario.p.y-32,0)/*,w_current_y*8-64)*/;} @@ -174,8 +176,9 @@ void world_draw(int x, int y) mx+=8; } - display_ennemi_table(); bonus_draw(); + display_ennemi_table(); + bullet_display(); mario_draw(); diff --git a/src/world.h b/src/world.h index 1463887..be3af42 100755 --- a/src/world.h +++ b/src/world.h @@ -24,7 +24,8 @@ typedef struct typedef struct { unsigned type :4; - unsigned time_hit_id :16; + unsigned time_hit_id :12; + unsigned state :4; unsigned hidden :4; unsigned content :4; unsigned number :4; @@ -50,7 +51,8 @@ typedef struct typedef struct { unsigned type :4; - unsigned time_hit_id :16; + unsigned time_hit_id :12; + unsigned state :4; unsigned hidden :4; unsigned content :4; unsigned number :4;