From 12d59b8adc8ce2ad246d015e3259e1e550e69b1c Mon Sep 17 00:00:00 2001 From: Tituya Date: Sun, 16 Aug 2020 15:20:20 +0200 Subject: [PATCH] Test friction sur les murs --- AST3.g3a | Bin 162204 -> 162732 bytes editor/levels/0.lvl | 2 +- editor/levels/11.lvl | 1 + editor/levels/8.lvl | 2 +- src/main.c | 5 +++++ src/menu.c | 6 +++--- src/setlevel.c | 10 ++++++++-- src/times.c | 18 +++++++++--------- time.py | 22 +++++++++++++--------- times.lvl | 18 +++++++++--------- 10 files changed, 50 insertions(+), 34 deletions(-) create mode 100644 editor/levels/11.lvl diff --git a/AST3.g3a b/AST3.g3a index 44d2158685be2da9544c549bd77f408e2a315b5e..42f53e808904d39572985a507c73fd660b041b94 100644 GIT binary patch delta 7167 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 delta 6639 zcmb7JdstIfw%_LjV&EVm1VmI4o>D+_5=d@n%n|NE>u~YBZX{~7I1R=53@g^W(duc}rBAupk*G>Q*_pf{G;_SWl z+H0@9)^D%9a(eEu$0@sq;)8RawKvti+i-L23H%FvGWP4?*FQv0AF9})q^QY0?Q!yG zLnO9(y9?+8r;cjw2@~eC3OQ>udCMrH)m!@i{v)7_m%IbE7Q~hzb}kb6h^?@g0V$@O z?URyasZ690rS_pR(m_b!ak7tk+6Iml<{-q*-;7u)9!QB;vEIdtibAZc$i*Z4IcKqQ z*KK-At5LjLK)Z{Oe5lMgyPTm`ND&$vL+q?eNNzugn*Q^0&x7 zl6@&Nmn@U@-y6#aJ=*ybW!ae=*!*`JCD|}7AWy&-%N>14@}^AZ%Q3}v({`;uGWGU0 z6;m1C!)dA&j;aour?%7A&oAKO0 zK&C^to03G7QCF$P9Eq1{jn+;Stou1k*&xWTHl?Zg*BI%FrmaqYkMb zsTky;>8zz1gV&9ODeGr_tFoxfDaW_2X6~(rmP)^6HPh#3;mpa$bM?8aLE5s^oOFDH zUhQlrnG^L{AhG9LSzMpivZy&-pT3%r{mHVhZ-4Vj{Yq#b${q=gYGekGDQ?|kaFwq~ zVUE);!f6LXR%noiY2G$tO~(N`zk08_Pyl9Ph$&NGH_bgTR@3n;w+?MH9-W>zqaJx2xFpy+i_w(N2%5@~;EkW) z-2?=(I|0l)M}aOAV4^8wRW4A-)hWl zf;c4VdQnZsj%qNSE)<;JfC5dL0y{B2;ivH}(TfL9M-|xlP2HO~M%%(ouk+?}Nz1%Z zE3j!iKyvtDJ>N6stLs; zQVn!(W=mTSrR_8&KE-M|MX)+A)(>+UBu=UAvPc4{wm-?u$N%Qg&n~I#L|Ia_G=^< z&e(d{kl}GJLbKZ7+;!&a+ftZqMhL?!!00Onp13fon}qIE+hbGq0qUuHUGXR2wLMPs zt3$tSY&(HGI#<_p>{aJiYjMR`3R6g6(uOu;Tf0HaWEvV5EWkxMlIaSq*cm+79#jF5mDR@O&7XYgIAZ3ajSKBfviHcfo z$F%WaP=pH)TAacp{2&!I&RTq*kL->ldYoVlc50jh8s`95Ay`hZN?l;p@e(qu6t#U= zDlqwuFY~NH-p=XXFx{K?ZnqMH+CM%x*63cl<8{A14>VzI!&S+3Ker8O#ON&wjvyWQ zG=$HE?xHJH6Jd3RQs<0iqp)^Oq2Im-nz$-m+dYlA(NXB932PtS_W&}Ge=q7$YvL3R zDmEmr&O_r@Ti!UbhuSknxHh;tXz{woJ(MJR4<%XHcFVT)sdNL8-uj|+FC|H|Ax(9e zP(B4e(1pCFUhJiCXpAVfwzx654>ehuEz<({5{^+n0bNF0CRyXy^`;v~ZzvoC>V*zL zrOKylER<~=-A#R`UBhVi@LH|?_@B$w&7W~hfIcBdKaG|uN@af&@u5dNVZ7KL#RRpER52{{LsWmNf2bx`*0;$S- zAmw(PEky%**!w#GQ*S&eu#Q!nB^%@1~b{52y+_kf=yW+dK zk~1Jg;`xKO;eU3kHR0q07(TCk-I`860XY53Biu$e3LMJh%j z&Km9$Wk0qoGcVKUsTf(PDFu%n3ez3xMV82ZBoXUZtYZ2q$hpfJHta?oA%TrYvPQ|} zYbZw^JMf1GtsF0#I64)Om&&Jsv>ODx#RaN18}i^ICnbjeuSB~)@~9UShPi;-zCaU> z->nYOIjfUrOC)lskqeDfUZk3tES12UJ8uD{13?0V%Z~p1GPE6NiUT}ON+&@opJ-Xs z2Z#8cw0(okt5cZ*yKn!utYI5!e?y{_M494MjQUqn1=MBdb%q4SHwv;wZPYwpvfa7_ z)BLXa-^x_XeW*9!E}z$zD+x14OMLaqC2x{jo{t8cKf+}-bEgB>#WRKFcY@MK_-suG z<%_S?1Z%50&i%EQLSG8RBt<(5JuB?w4ivPp&lH0!SU(EsIUKQ@3@JxQ`pzv%xk}z7 zWtTy*D8A>~S;9$_zJ^2W6d)1s#Cn|mR+>(%Ctca$qII%n*%{eKJC>0`PS$_BAtN-6 z(Oujo;Oo1O^has!5D=-R+9oX<<3w_YSMVCj^zYg$i~YYlZ2LvzxrRxdqof;Sl&F3_ zU)^1Ow}u>&?&`ISR?wp@5s2nWLedzwAX8PoKzkD)+L0e5Un9JK<+uWpaKEErO;1%1#&seAZ^!hw=>K+mK^nP z8ngb-xt~=PX(Ocn2|O1X=jS^b6UV0n3E3XEG6c|K&`pRX-@0_GB0$Q^If#d zU@&Em5;f3TZ1@eFx0$-`AddN-*fXs-%i2HG%7vBuHOyz{-3`xZgZBil!|ji_RZMqE66#^|l1;7AbFNjW5Gz*$)4It#9oU|Nw8+OKDqcdCe( zS9nuKYp?X9-@y-tzFc!sUnzjTgabXJtH48ArGjyvYP2f_$4TDUdo3#61jQ^FfrFT zM>;V_2a5!gN$Vf>BN<(Ib2UWWBq3J@FVQKVcO3_=gWuNe=n!gtnuuJ{cBNbr$cZFG zeou@iA_&|>fL{pi95-hqC!?B_L!vsKwKB2v?HSXB@d0&|4Mq4MFiLh9e#)l49ic0v zV)JJ6@l+V{@XE|BDy@9`gybB-1k$@~o7x@Fej6qPv|He>e|wknuL*ukw$|>cr(%x9b{_Ca zl-B>}Z+zN~-y5?zkbP``kpXI;X#jtmK%PTjO1fUKw6+C;Kw_Q3I$R^ zn*&-7ln$f;(gN)VssyS5(gS?~Gz|WcA_aUOQ&3Sr@j#oMK2uPz11L)3?CJytmRf>yS%u zCx~Q$_e(X{>;3JKK@W%ySOao3BvpjKaTG+Z6vSe!P`g}$c)Q_K??=-?5AfCZmoA8f zPj3Oku910KGTY>y5$dc~-TG0to7R_i<6<%*Nl09>h@Iz!lME}p6E-6@5uh)-Prhjw zn+zi~Emz~(mQeCK*HYlAaLD%BykrGdgsm-N%(e#83WqVX^%xbcaDdlxfYgYUt3^Kk z0A_zT2rhiVi;Ci@KE%b`lfaiR1NJ(zZz?R4gvc^LXN^r~w$lsXh$^Vs*3}5$L@->! zfi?~FML@BwFC!NA4O+$Ei;~OZxVB>Uj~@urz+>toM(ZE1QFMY8pZhR~Rvs~4{qPzs z+yK%rbh0g&@+H3llFow$9;gekOYY;V?LRzacab5&HhyvbT`GWxF9C-;r%aAv>xCJ{ z`adnCgUQ&W%E@uq#7UrYM(c%lCUm%#b1m&$w&tV11~~V7nTS4Xk#Y0KDs$qQnlTbRf3qSZIn7n*G4Gl`|$_VA%bPm~Wjw!U0)Jsx2VqrM_ zQ@eXAVqdN@F8}jwDm3FREM!IO+9Qa~0B6pIAgl#9WZeZaAT~P?bD#BiXM;1dF9SV* zLPLt#zkErjH{sF0M8nG%{yBW3g}G~w7-RqIjKF(yWrp(vkUJ?i5L>@kGgYjz0?S!q z|8|!W3eO_802yb0Mbi`Q@UJ&ew6F$OUQ6*Tgw=AunFSZ{)oUxC=^6t&qA6#; z-~v*Bbo%v9ZzApLaL^+yGRY)wG+**8{35-$QEeu@^7}&g_rU9Zx%QQ z^PBMCH;2XtjpcuT5A4!oac7$64h`I?kk__JanW;KN?sw=N8k}T~p+JFoDNINnBOkH1A$;E4MhnjxHI`DEF1TRizYTJuqg#!G z|A?S;@+Ytrc-TlU@`7V~7zngSh6AYqB-aTav8zv!7sT-n&@H%I)Ib_Y_T++x@v!r7 zXRvVeATRqjAvP4^8wS~v(!0hN+#_$1&kRURGb$0A09ks0)(ZrxTmrHtZ1VP($bY@; z>IakT0~7pffvONI0f$P{G5_BW=U$2$QMo<3!dx=h=R;U{r!5elwu$ito3HUdY?6+^4a7-XPfXRo@d(%VG-C+j@6Z$b57N8o Q#rsbT9;81L!2iSfUutjJmH+?% diff --git a/editor/levels/0.lvl b/editor/levels/0.lvl index fe2c5a3..0080bf1 100644 --- a/editor/levels/0.lvl +++ b/editor/levels/0.lvl @@ -1,4 +1,4 @@ -11100111111111111111111111l00000l01BB1BB1BB1BB1BB1100000000000100100100100110000000000000010010010011b0t000000000000001001001111111000000000000000100111111d000000000000000000100000d000000000000000000010000d000000000000000011110000d000030000a0c0m0000110000d000030000a0c0m0000110000d000030000a0c0m0000110s00d00k0300K0a0c0m00e0111100111111111111111111116 +11100111111111111111111111l00000l01BB1BB1BB1BB1BB1100000000100100100100100110000000010000010010010011b0t000001000000001001001111111000100000000000100111111d000100000000000000100000d000100000000000000010000d000000000000000011110000d000030000a0c0m0000110000d000030000a0c0m0000110000d000030000a0c0m0000110s00d00k0300K0a0c0m00e0111100111111111111111111116 7 9 \ No newline at end of file diff --git a/editor/levels/11.lvl b/editor/levels/11.lvl new file mode 100644 index 0000000..6aa777f --- /dev/null +++ b/editor/levels/11.lvl @@ -0,0 +1 @@ +11111111111111111111111111000000010000000100000101100000001000000010000010110000000100000001000001011000100010001000100100101100010001000100010010010110001000100010001001001011000100010001000100100101100010001000100010010010110001000100010001001001011000100000001000000100001100010000000100000010000110s01000000010000001000e111111111111111111111111116 \ No newline at end of file diff --git a/editor/levels/8.lvl b/editor/levels/8.lvl index 0481dd9..b567dba 100644 --- a/editor/levels/8.lvl +++ b/editor/levels/8.lvl @@ -1 +1 @@ -dddddddddddddddddddddddddBBBBBBBBBBBBBBBBBBBBBBBBB1000010k10011111dt0a000011000010010010000d11a00001100001BB100100000000000013000000000010001110000000300000000001aaaaaa00000001111110000010000000011111100000000001000000001000110000000a001BBBd00a0100013000000000010001000010003300s000000010K0100001e003aaBBBBBBBBBBBBBBBBBBBaaaaddddddddddddddddddddddddd6 \ No newline at end of file +dddddddddddddddddddddddddBBBBBBBBBBBBBBBBBBBBBBBBB100001kk10011111dt0a000011000010010010000d11a00001100001BB100100000000000013000000000010001110000000300000000001aaaaaa00000001111110000010000000011111100000000001000000001000110000000a001BBBd00a0100013000000000010001000010003300s000000010K0100001e003aaBBBBBBBBBBBBBBBBBBBaaaaddddddddddddddddddddddddd6 \ No newline at end of file diff --git a/src/main.c b/src/main.c index 9cb77de..cdf4670 100644 --- a/src/main.c +++ b/src/main.c @@ -13,6 +13,7 @@ #define ACCELERATION 0.2 #define MAX_VSPD 9.0 +#define FRICTION 0.1 int main(void); @@ -122,6 +123,8 @@ void game(int *id_level, char mode) if(!collide_solid(player_x, player_y+vert_spd+1, level, gravity)) { if (vspd void set_level(int id_level, char level[], int *startx, int *starty, char *gravity, int *appear, int *disappear){ switch(id_level){case 0: -memcpy(level,"11100111111111111111111111l00000l01BB1BB1BB1BB1BB1100000000000100100100100110000000000000010010010011b0t000000000000001001001111111000000000000000100111111d000000000000000000100000d000000000000000000010000d000000000000000011110000d000030000a0c0m0000110000d000030000a0c0m0000110000d000030000a0c0m0000110s00d00k0300K0a0c0m00e011110011111111111111111111",350); +memcpy(level,"11100111111111111111111111l00000l01BB1BB1BB1BB1BB1100000000100100100100100110000000010000010010010011b0t000001000000001001001111111000100000000000100111111d000100000000000000100000d000100000000000000010000d000000000000000011110000d000030000a0c0m0000110000d000030000a0c0m0000110000d000030000a0c0m0000110s00d00k0300K0a0c0m00e011110011111111111111111111",350); *appear=7; *disappear=9; break; @@ -36,7 +36,7 @@ case 7: memcpy(level,"111001111111100d0d0011111100000111ddd000d0d0000001100000000000000dtd00000e1111111ddd111111111111111100000000000000000000d0000111111111dd111110100d000110001100000000010100d0001000011000000000d0d00d0000000000000000000d0d00d00001111dd111000000dld00111111000011111ddd00d0d00111111000011111ddd00d0d001111110s0011111ddd00d0d0011111111001111111100d0d00111116",350); break; case 8: -memcpy(level,"dddddddddddddddddddddddddBBBBBBBBBBBBBBBBBBBBBBBBB1000010k10011111dt0a000011000010010010000d11a00001100001BB100100000000000013000000000010001110000000300000000001aaaaaa00000001111110000010000000011111100000000001000000001000110000000a001BBBd00a0100013000000000010001000010003300s000000010K0100001e003aaBBBBBBBBBBBBBBBBBBBaaaaddddddddddddddddddddddddd",350); +memcpy(level,"dddddddddddddddddddddddddBBBBBBBBBBBBBBBBBBBBBBBBB100001kk10011111dt0a000011000010010010000d11a00001100001BB100100000000000013000000000010001110000000300000000001aaaaaa00000001111110000010000000011111100000000001000000001000110000000a001BBBd00a0100013000000000010001000010003300s000000010K0100001e003aaBBBBBBBBBBBBBBBBBBBaaaaddddddddddddddddddddddddd",350); break; case 9: memcpy(level,"00000ddddddd100000000000011111111111111111110011111000000dd1111ddd0K10000b1100111000000100000100000110000100000010000010010011000k111dd101dd00d10000011000110000001000001BBBB011000100011dd1000001dddd01100010ddd1dd1d00dd1011001133310ddd1dd1BBBBB1t00001100000ddd1dd1000001ddd1111s0000ddd1dd10000011111111BBB111aaaaa110001111111100000000000e1000000000000",350); @@ -44,6 +44,9 @@ break; case 10: memcpy(level,"111111111133111111100011111111111133311111110K01111100000100111111111000111110s000101111111000000011111110K10111111d000000011111110K1011111a001BBBBB111100000101111d0a010000011110000010111a03011d0ddd1111001ddd011d0a0d11000001111000000010a30111100e00111100000k0130ad1111aaaaa1111dd000001031111111ddd1111111111111001111111aaa1111111111111001111111000111",350); break; +case 11: +memcpy(level,"11111111111111111111111111000000010000000100000101100000001000000010000010110000000100000001000001011000100010001000100100101100010001000100010010010110001000100010001001001011000100010001000100100101100010001000100010010010110001000100010001001001011000100000001000000100001100010000000100000010000110s01000000010000001000e11111111111111111111111111",350); +break; } set_gravity(id_level, gravity); unsigned int x = 0; @@ -92,6 +95,9 @@ break; case 10: *default_gravity = 0; break; +case 11: +*default_gravity = 0; +break; }} void del_level(char level[]) {memcpy(level,"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",350);} \ No newline at end of file diff --git a/src/times.c b/src/times.c index 9d9e195..3de86d8 100644 --- a/src/times.c +++ b/src/times.c @@ -12,34 +12,34 @@ void check_medal(unsigned int frame_level, int id_level) { float time=1.0; float framefloat = frame_level; -float level_time[] = {5.88,8.31,6.12,8.72,3.92,3.51,6.76,7.48,12.26,9.25}; +float level_time[] = {5.81,8.29,5.89,8.68,3.84,3.58,6.81,7.48,10.46,9.25}; time = level_time[id_level-1]; if(frame_level/FPS < (unsigned int)time || (frame_level/FPS <= (unsigned int)time && (unsigned int)((framefloat)/FPS*100-frame_level/FPS*100) <= (unsigned int)((time)*100-(int)(time)*100))) dimage(380,8,&img_createur); -if(frame_level/FPS < (unsigned int)(time*1.1) || (frame_level/FPS <= (unsigned int)(time*1.1) && -(unsigned int)((framefloat)/FPS*100-frame_level/FPS*100) <= (unsigned int)((time*1.1)*100-(int)(time*1.1)*100))) dimage(360,8,&img_or); if(frame_level/FPS < (unsigned int)(time*1.2) || (frame_level/FPS <= (unsigned int)(time*1.2) && -(unsigned int)((framefloat)/FPS*100-frame_level/FPS*100) <= (unsigned int)((time*1.2)*100-(int)(time*1.2)*100))) dimage(340,8,&img_argent); +(unsigned int)((framefloat)/FPS*100-frame_level/FPS*100) <= (unsigned int)((time*1.2)*100-(int)(time*1.2)*100))) dimage(360,8,&img_or); if(frame_level/FPS < (unsigned int)(time*1.5) || (frame_level/FPS <= (unsigned int)(time*1.5) && -(unsigned int)((framefloat)/FPS*100-frame_level/FPS*100) <= (unsigned int)((time*1.1)*100-(int)(time*1.1)*100))) dimage(320,8,&img_bronze); +(unsigned int)((framefloat)/FPS*100-frame_level/FPS*100) <= (unsigned int)((time*1.5)*100-(int)(time*1.5)*100))) dimage(340,8,&img_argent); +if(frame_level/FPS < (unsigned int)(time*2) || (frame_level/FPS <= (unsigned int)(time*2) && +(unsigned int)((framefloat)/FPS*100-frame_level/FPS*100) <= (unsigned int)((time*2)*100-(int)(time*2)*100))) dimage(320,8,&img_bronze); } void draw_time(int id_level) { dclear(C_WHITE); float time=1.0; -float level_time[] = {5.88,8.31,6.12,8.72,3.92,3.51,6.76,7.48,12.26,9.25}; +float level_time[] = {5.81,8.29,5.89,8.68,3.84,3.58,6.81,7.48,10.46,9.25}; time = level_time[id_level-1]; dimage(160,90,&img_createur); dprint(175,90,C_BLACK,"%.2j",(int)(time*100)); dimage(160,110,&img_or); -dprint(175,110,C_BLACK,"%.2j",(int)(time*1.1*100)); +dprint(175,110,C_BLACK,"%.2j",(int)(time*1.2*100)); dimage(160,130,&img_argent); -dprint(175,130,C_BLACK,"%.2j",(int)(time*1.2*100)); +dprint(175,130,C_BLACK,"%.2j",(int)(time*1.5*100)); dimage(160,150,&img_bronze); -dprint(175,150,C_BLACK,"%.2j",(int)(time*1.5*100)); +dprint(175,150,C_BLACK,"%.2j",(int)(time*2*100)); dupdate(); getkey(); } \ No newline at end of file diff --git a/time.py b/time.py index 89fb93c..d7b3aaa 100644 --- a/time.py +++ b/time.py @@ -1,3 +1,7 @@ +gold = 1.2 +argent = 1.5 +bronze = 2 + f = open("times.lvl","r+") d = open("src/times.c","w") ids=f.readlines() @@ -23,12 +27,12 @@ d.write(f"{','.join(times)}") d.write("};\ntime = level_time[id_level-1];\n\n\ if(frame_level/FPS < (unsigned int)time || (frame_level/FPS <= (unsigned int)time && \n\ (unsigned int)((framefloat)/FPS*100-frame_level/FPS*100) <= (unsigned int)((time)*100-(int)(time)*100))) dimage(380,8,&img_createur);\n\ -if(frame_level/FPS < (unsigned int)(time*1.1) || (frame_level/FPS <= (unsigned int)(time*1.1) && \n\ -(unsigned int)((framefloat)/FPS*100-frame_level/FPS*100) <= (unsigned int)((time*1.1)*100-(int)(time*1.1)*100))) dimage(360,8,&img_or);\n\ -if(frame_level/FPS < (unsigned int)(time*1.2) || (frame_level/FPS <= (unsigned int)(time*1.2) && \n\ -(unsigned int)((framefloat)/FPS*100-frame_level/FPS*100) <= (unsigned int)((time*1.2)*100-(int)(time*1.2)*100))) dimage(340,8,&img_argent);\n\ -if(frame_level/FPS < (unsigned int)(time*1.5) || (frame_level/FPS <= (unsigned int)(time*1.5) && \n\ -(unsigned int)((framefloat)/FPS*100-frame_level/FPS*100) <= (unsigned int)((time*1.1)*100-(int)(time*1.1)*100))) dimage(320,8,&img_bronze);\n\ +if(frame_level/FPS < (unsigned int)(time*"+str(gold)+") || (frame_level/FPS <= (unsigned int)(time*"+str(gold)+") && \n\ +(unsigned int)((framefloat)/FPS*100-frame_level/FPS*100) <= (unsigned int)((time*"+str(gold)+")*100-(int)(time*"+str(gold)+")*100))) dimage(360,8,&img_or);\n\ +if(frame_level/FPS < (unsigned int)(time*"+str(argent)+") || (frame_level/FPS <= (unsigned int)(time*"+str(argent)+") && \n\ +(unsigned int)((framefloat)/FPS*100-frame_level/FPS*100) <= (unsigned int)((time*"+str(argent)+")*100-(int)(time*"+str(argent)+")*100))) dimage(340,8,&img_argent);\n\ +if(frame_level/FPS < (unsigned int)(time*"+str(bronze)+") || (frame_level/FPS <= (unsigned int)(time*"+str(bronze)+") && \n\ +(unsigned int)((framefloat)/FPS*100-frame_level/FPS*100) <= (unsigned int)((time*"+str(bronze)+")*100-(int)(time*"+str(bronze)+")*100))) dimage(320,8,&img_bronze);\n\ }\n\ \n\ void draw_time(int id_level)\n\ @@ -43,11 +47,11 @@ d.write("};\ntime = level_time[id_level-1];\n\n\ dimage(160,90,&img_createur);\n\ dprint(175,90,C_BLACK,\"%.2j\",(int)(time*100));\n\ dimage(160,110,&img_or);\n\ -dprint(175,110,C_BLACK,\"%.2j\",(int)(time*1.1*100));\n\ +dprint(175,110,C_BLACK,\"%.2j\",(int)(time*"+str(gold)+"*100));\n\ dimage(160,130,&img_argent); \n\ -dprint(175,130,C_BLACK,\"%.2j\",(int)(time*1.2*100));\n\ +dprint(175,130,C_BLACK,\"%.2j\",(int)(time*"+str(argent)+"*100));\n\ dimage(160,150,&img_bronze); \n\ -dprint(175,150,C_BLACK,\"%.2j\",(int)(time*1.5*100));\n\ +dprint(175,150,C_BLACK,\"%.2j\",(int)(time*"+str(bronze)+"*100));\n\ dupdate();\n\ getkey();\n\ }") \ No newline at end of file diff --git a/times.lvl b/times.lvl index 896df84..8a52ff0 100644 --- a/times.lvl +++ b/times.lvl @@ -1,10 +1,10 @@ -5.88 -8.31 -6.12 -8.72 -3.92 -3.51 -6.76 +5.81 +8.29 +5.89 +8.68 +3.84 +3.58 +6.81 7.48 -12.26 -9.25 \ No newline at end of file +10.46 +9.25