From db9f1beca420df496b08beb95b42cc1eadfc75d0 Mon Sep 17 00:00:00 2001 From: Tituya Date: Mon, 20 Jul 2020 00:55:36 +0200 Subject: [PATCH] =?UTF-8?q?mise=20=C3=A0=20jour=20=C3=A9diteur,=20nouveaux?= =?UTF-8?q?=20niveaux,=20README=20=C3=A9diteur?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AST3.g3a | Bin 60264 -> 61016 bytes editor/AST3generator.py | 64 ++++++++++++++++++++++++++-------------- editor/README.md | 33 +++++++++++++++++++++ editor/levels/1.lvl | 2 +- editor/levels/2.lvl | 2 +- editor/levels/3.lvl | 2 +- editor/levels/4.lvl | 3 +- editor/levels/5.lvl | 4 +++ editor/levels/6.lvl | 4 +++ editor/setlevel.c | 55 ---------------------------------- include/define.h | 2 +- src/setlevel.c | 24 ++++++++++++--- 12 files changed, 109 insertions(+), 86 deletions(-) create mode 100644 editor/README.md create mode 100644 editor/levels/5.lvl create mode 100644 editor/levels/6.lvl delete mode 100644 editor/setlevel.c diff --git a/AST3.g3a b/AST3.g3a index 7e6bc0b1b4191bf8d8f9770de3f7e211036b5848..22709105225a91cd27af853fd61e8be6bb4cf59a 100644 GIT binary patch delta 3372 zcmZV>4N#QF_3Z}-cOrP;@u!$OLBtBmo~U5L$RQ|JNdZeLB&dg=XiG#Hg;_NgpgPJBboIz3z?C42+y+W zjSoDR(WR8etP(Rwp*NB}#de>`+%45W=XNO78V4%cfR>v^ble0n06nZ3fg-*Ephq%C z$g4F{9H@hI-9ey4gAfE%(JEuUo?ijfZx;*N{}-Wrk2t#j1yOVX-J8#xCHH>d0GONv zsxAjwkP37k`rwD$q6VNll7Z&M1Kphov@nM`O+TAI-s`hHX$|?>XPN)d_i3SIhWY8= zA#usjI_+!{(W@E(R$dySe(Ym=BAd-dxBQ&qrP3ZE#NJ{b9+;Qg3^Z~k&?qNR;UrL> zV+j@>lpF5d5!@W;ybpARMN&opWz`c>=R z`r^32T4C@zo7JoiAiVK500@b~heX%Ks zdsilU4J%6TtZ2w&1Le^qk|__zm=~N0P4tQm?F~yrk-M6Q&@ea2Ys6ottnnBmk!>|b zqi7{H+aAC@?}wn(G|aHYjFggA@&VaGwvuh64(>u9RKN*12}ePNmyJ1`Rfo7*x+xlt z`CEWV@O2dfPln$m%;nzKcFFq+lN&dCR=z z`@)i(i5hR8iLcx~exHQohV(2UVW9HZl(ltVd4HtAEC2Y?M>UGv<3p6+RBf!))VnaB zz4z~bz~90Xy}p6dhCRolLw|&Fxi|Dys;-UN{;kaE3deprwtEb`c8&GV zwGV)*e~!JM&)n|d%q3>OL1Moh<<}qRBKX-~40`lyrgzRk&)OSu`1b3T1Y@VQq>3y) z9eL;H>Q%a`8;8~Q-+cpkTX-w8S}?(lSejY#vwVL7Xbx8T7Oe1XAwZ4gJ;KLAzhH<2 z71=7w3%U12lR1fya@J<~*28}hUf_Dxax{=wSl7|pB%Yl;7D1M?j$;Lie4wl2S=8~3 zeC2nEl^_2r8D&`&7l>6Hub4~bS(_9jz7<~&Z$%cwK!fpR1yi7NG>o2zP^1DaZelqn zUZ{*O!D0j&P|b2a$|FYB@zEii6p#cFqiK&Z4ozfB~OFdN(?3@HZ!LoDzEvh>=M0sluXmRQc(6yIW5kV_;PxiVW{R~X*HP2dq2 zFwr44A+AF%O1(9K&j^#Q)3JfNNYcXG>l3^uxD}bMwXpPhtxBQ*)h=QO>r=cB%8fY` zgO75G-Ssa7yphg^Fq|JX>=eR-So)c_5sB4jPLsvqL74k=gjC*lm1=*i7JqmAl;FoC zxx9yrfFW{Ni;cBiT>p!U!ipBmOn%c30j=}0*sMd1Qu!iLU|Z(mK@cLg)q>-Nm|WPo}Be zoWrSN=cnh1KMF@@x)i2a%<*}kSoK+)Fb`S0K}z6w-aazMwL>8U}HA>SH!_~wM63F(2~F(bXl`F(6W;ViAvG%>#HOj z)%`H@Ylkrs2M8BXc`c?OITiOkxUN9xWFf6#^IBb$2Bb9gl0G33I}={>axB+6F{kx6 z3XemmnE_(ZZw0}%X1ew?{+-VlWu|uCIR@He`98f`)Li?eARIEX*6SN)ya)IVPX@ZF zgDE@S*yeOZkPcSSu^MF(Ci&kmn`~lt#|=Wd#k${r;7)SHr+-*T78l>gw}DpXbaRAn z-~<95G-nvAOoMS_Gr>XMDQ6kPe14?M$gi4A~0T zl!j!B3vlm5 zPUF-LK>XLAv&re(3UNbEcCgvW%MroA>r5Jy;se%?PHm?#r_q(_>HXA##xwzqXE$&X7&DrCylI delta 2758 zcmZWr4Nz3q6+ZVZi@O54;I2S~?D8j8h+Gv5Q4@9r#YU`Pi9$v5RH{}m{47?iMAo<^ z%bzS>OpH2}woEiiU7AN5C&9^1WhxnQTofbII_dIf$%vVqgh6Y!ZqMbRNv3b-d*|Hq zbMHOpo_qEU+*6Ewp;&UE{ffhGJJopG_Y{Adp89;+_x=grdkR1N8zJ9~4;3~y&SxU= z7ar_s7KdjnetFU2lx07ba!64Sif2e&vwYjP766@RS823vbZiBB&^l`1QxGH2U&oF@ zDIWmPLxrQ{J02x&^g+2{El{FGgaK7{$dvO@xj;iwSy@q7$f42Xxl2 z(kwh6g$Jk~LgB`Zi$Lcj0?iwM8CQ%*-Jm%1HBv9od<`NNfg8<7n-C|=@L7NcHvo-6 z+t@M5dtg{tW-w{^v|0DkK7XG-r+{v_3^dz{vI<=0HAFXG9&_}VyP-}cX%DR-v3=R@ z?2VJdPnPI}r(~w-mBsN*YIoL-Z-;4lt{7`j)sogvn58N-^Ut<@&F0k5CSmYNt76QX zI;R#+7Wch!A5QEYsW1iTwFXr^X??$l4Uq?+f9ZBgdH|^Jru3&|BJE2t1&r*!wXEfJ z_GMKPNo2F$T3Q`Xt5M!GZJLi}^VvHrtVHCBFa!}t2T7}7QwB<}Vem@AqEdFp}QV-U3qL^+| zGzJcmK}B+Cqrc6s)Hg`z+r!0;tJ0*>2mo)K;BNNEREjeB-ahiVO*3?jxZjn>{{qlLWG!x8sQ) z^Sr%VnGE#RKvr;c9p^$SS^Lp{kZxwPo+WwGg5S&|k$G)Ova%DapSKZyxqyZn5uA=N zu_j&_0kou(HPk#()2Cn&fzB;p4e#tElzHAcgzsY8xp1^G+(QjTTip1j4s1+eNL?(k zHceT@HLSGOti+j-8>>wqMy9RXIjyOxTc_mf8Ch@L*FwpJ)Kx!QsBW1mJ6>*64X4aI z)#zv$T9z$9V4})!=5m8vf#rD5%Q0c)xQB8q&+;q;+LRX}_8>|T7DNZajgg>V`8ZIs z7J>SMCoXr31Kt9nps9MhvimV|wCbRmXORJAD8d=pU;l@>!`-(d}f8l4Ojd?G`U{r>SdVCu%#)Mlp zM7#W|y-DT9fZgBn2E#iT(B)QEb@93qi#DxQ%4+|Z1mh}3EJqCnW?BPu%_63~6z#v- zgX|u*^3rK_o7^>4MlkoK;UFi_OpGeih$v+)$2HQyPIe^VySpQeUubier25k?A{Ymx z(vLnSap)e5nP1(Bk+?xPi;k-^@N6S+>_Q&z#OfB7)fp3Mot6}$q@s`X3npw#_{rdh zj%DD1dL8vTcBcHuC zGZ&XyuLZi%&QhH}7&bWLiJf&iUqzcVAOHT?SSop)R|z>IIsdxFk0eSF*XEOjCH#&6 z&=<~df_I<>A>z0bF@kYl=5nAbvRDq$t)nF)@;D3w4tHWvKStPrhGKZ3m~68})-SMe zs?vmxBe3bj+kh@mp}ttwM^*9p^t7a19?z+g?R7Ss&jM7Nfw=e4=T8Xs31;dImvq-x z -void set_level(int id_level, char level[], int *startx, int *starty, char *gravity, char check_coin, int *appear, int *disappear){ -switch(id_level){case 1: -memcpy(level,"10011111111dddd111111111100011110000000000000000000001111001111111dddd100001111111001dd000ddddd111111111111001dd0t0ddddddddd11000001001dd000ddddddddd11000001001aaaaaaaaaaaaaa110s00010010000000000000e1111100100100000000000aaa11111001001000000000ddddd1111100100100000000011111100010000010000000003000000001000001000K0000030k0001001111111111111111111111",350); -break; -case 2: -memcpy(level,"111001111111100d0d0011111100000111ddd000d0d0000001100000000000000dtd00000e1111111ddd111111111111111100000000000000000l00d0000111111111dd111110100d000110001100000000010100d0001000011000000000d0d00d00000000l0000000000d0d00d00001111dd111000000d0d00111111000011111ddd00d0d00111111000011111ddd00d0d001111110s0011111ddd00d0d0011111111001111111100d0d0011111",350); -break; -case 3: -memcpy(level,"11001111111001111111111111000111dddd000000000100013000111dddd00000000010003300000000dd11111000010e03100000000dd03a01000011111111110000dd03a01000000001100s1dd00ddt3a0100000000110001dd00dd1110100000000110001dd0Kdd00001ddd000ddd10001dd00dd00001111100ddd10001dd00dd00001000000ddd30001dd0000000010k000000330001dd0000000010000000031d00111111100111111111111",350); -break; -case 4: -memcpy(level,"1dddddd100111111111111111000000000011111000000000000000000l01100c00000000001aaaaaaa111100c00000000011dddddddddd1001aaaaaaaaa11cccccccccc1001ddddddddd1000000000001331000000aa000000000000s10e1k0000000001ccccccccc111111111113311100000000011001000000000110000000001100b0000000001100000000011t0b00000000011000K0000011111aaaaaaaaa1111111110011111ddddddddd1",350); -*appear=13; -*disappear=10; -break; -case 5: -memcpy(level,"11111111111111111111111111000000000000000000000001100000000000000000000000110000000000000000000000011000000000000000000000001100000000000000000000000110000000000000000000000011000000000000000000000001100000000000000000000000110s00000000000000000000011111c0000000000000000000110010000000000000000000011001000000000000000000e011111111111111111111111111",350); -*appear=8; -*disappear=15; -break; -}if(check_coin) for (int i = 0; level[i]!='\0' ; i++) if(level[i]=='t') level[i]='0'; -set_gravity(id_level, gravity); -unsigned int x = 0; -unsigned int y = 0; -unsigned int i = 0; -while (i!=strlen(level)){ -switch(level[i]){ -case 's': -*startx = x; -*starty = y; -break;} -x+=16; -if(x==16*25){x=0; -y+=16;}i++;}} -void set_gravity(int id_level, char *default_gravity){ -switch(id_level){case 1: -*default_gravity = 0; -break; -case 2: -*default_gravity = 0; -break; -case 3: -*default_gravity = 1; -break; -case 4: -*default_gravity = 0; -break; -case 5: -*default_gravity = 0; -break; -}} -void del_level(char level[]) -{memcpy(level,"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",350);} \ No newline at end of file diff --git a/include/define.h b/include/define.h index af1280c..fb8b383 100644 --- a/include/define.h +++ b/include/define.h @@ -1,3 +1,3 @@ #define PLAYER_SPEED 2 #define PLAYER_HEIGHT 11 -#define FPS 80 +#define FPS 70 diff --git a/src/setlevel.c b/src/setlevel.c index 956402f..b6a2e2f 100644 --- a/src/setlevel.c +++ b/src/setlevel.c @@ -2,18 +2,28 @@ #include void set_level(int id_level, char level[], int *startx, int *starty, char *gravity, char check_coin, int *appear, int *disappear){ switch(id_level){case 1: -memcpy(level,"10011111111dddd111111111100011110000000000000000000001111001111111dddd100001111111001dd000ddddd111111111111001dd0t0ddddddddd11000001001dd000ddddddddd11000001001aaaaaaaaaaaaaa110s00010010000000000000e1111100100100000000000aaa11111001001000000000ddddd1111100100100000000011111100010000010000000003000000001000001000K0000030k0001001111111111111111111111",350); +memcpy(level,"10011111111dddd111111111100011110000000000000000000001111001111111dddd100001111111001dd000ddddd111111111111001dd0t0ddddddddd11000001001dd000ddddddddd11000001001aaaaaaaaaaaaaa110s00010010000000000000e1111100100100000000000aaa11111001001000000000ddddd1111100100100000000011111100010000010000000003000000001000001000K0000030k00010011111111111111111111116",350); break; case 2: -memcpy(level,"111001111111100d0d0011111100000111ddd000d0d0000001100000000000000dtd00000e1111111ddd111111111111111100000000000000000l00d0000111111111dd111110100d000110001100000000010100d0001000011000000000d0d00d00000000l0000000000d0d00d00001111dd111000000d0d00111111000011111ddd00d0d00111111000011111ddd00d0d001111110s0011111ddd00d0d0011111111001111111100d0d0011111",350); +memcpy(level,"111001111111100d0d0011111100000111ddd000d0d0000001100000000000000dtd00000e1111111ddd111111111111111100000000000000000l00d0000111111111dd111110100d000110001100000000010100d0001000011000000000d0d00d00000000l0000000000d0d00d00001111dd111000000d0d00111111000011111ddd00d0d00111111000011111ddd00d0d001111110s0011111ddd00d0d0011111111001111111100d0d00111116",350); break; case 3: -memcpy(level,"11001111111001111111111111000111dddd000000000100013000111dddd00000000010003300000000dd11111000010e03100000000dd03a01000011111111110000dd03a01000000001100s1dd00ddt3a0100000000110001dd00dd1110100000000110001dd0Kdd00001ddd000ddd10001dd00dd00001111100ddd10001dd00dd00001000000ddd30001dd0000000010k000000330001dd0000000010000000031d00111111100111111111111",350); +memcpy(level,"11001111111001111111111111000111dddd000000000100013000111dddd00000000010003300000000dd11111000010e03100000000dd03a01000011111111110000dd03a01000000001100s1dd00ddt3a0100000000110001dd00dd1110100000000110001dd0Kdd00001ddd000ddd10001dd00dd00001111100ddd10001dd00dd00001000000ddd30001dd0000000010k000000330001dd0000000010000000031d001111111001111111111117",350); break; case 4: memcpy(level,"1dddddd100111111111111111000000000011111000000000000000000l01100c00000000001aaaaaaa111100c00000000011dddddddddd1001aaaaaaaaa11cccccccccc1001ddddddddd1000000000001331000000aa000000000000s10e1k0000000001ccccccccc111111111113311100000000011001000000000110000000001100b0000000001100000000011t0b00000000011000K0000011111aaaaaaaaa1111111110011111ddddddddd1",350); *appear=12; -*disappear=5; +*disappear=1; +break; +case 5: +memcpy(level,"0000000000000000000000000000000000000000000000000000000000000000000000000000011dd111111111111111110000100000100000010000001000011cc001s0000d00000001000010000e111dd0100110dd100001001111000d0000000dd100001000001000111d000ddd1000010000000000000000ddd1000011111111111d11111111100000000000000000000000000000000000000000000000000000000000000000000000000000",350); +*appear=12; +*disappear=6; +break; +case 6: +memcpy(level,"11111111111011111dddd1111100001dd0000dd100000000011s0001dd0d11dd10000000001111001dd0d1111100111100011dd001dt0d10000001dd100011dd001d11d10000001dd100011dd00dd11110011111dd100011dd00000000001dddddd100011dd1111dbd1111ddd111100011ddddddd0dd1d1ddd100000011ddddddd0000d1ddd1e0000011ddddddd1110d1ddd111cccc11dddddddddd0d1ddd111dddd11111111111101111111111111",350); +*appear=12; +*disappear=7; break; }if(check_coin) for (int i = 0; level[i]!='\0' ; i++) if(level[i]=='t') level[i]='0'; set_gravity(id_level, gravity); @@ -42,6 +52,12 @@ break; case 4: *default_gravity = 0; break; +case 5: +*default_gravity = 0; +break; +case 6: +*default_gravity = 0; +break; }} void del_level(char level[]) {memcpy(level,"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",350);} \ No newline at end of file