From b44efef7f12ae53f69aeb11bce8a9f5950e90e77 Mon Sep 17 00:00:00 2001 From: Tituya Date: Mon, 17 Aug 2020 20:36:46 +0200 Subject: [PATCH] =?UTF-8?q?suppression=20friction=20mur,=20ajout=20acc?= =?UTF-8?q?=C3=A9l=C3=A9ration=20hspd.=20Edit=20levels?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AST3.g3a | Bin 164432 -> 164544 bytes editor/AST3generator.py | 4 ++- editor/levels/0.lvl | 1 - editor/levels/1.lvl | 2 +- editor/levels/10.lvl | 2 +- editor/levels/11.lvl | 2 +- editor/levels/2.lvl | 1 - editor/levels/3.lvl | 2 +- editor/levels/4.lvl | 2 +- editor/levels/5.lvl | 1 - editor/levels/7.lvl | 2 +- editor/levels/8.lvl | 2 +- editor/levels/9.lvl | 2 +- src/main.c | 63 +++++++++++----------------------------- src/setlevel.c | 4 +-- times.lvl | 2 +- 16 files changed, 31 insertions(+), 61 deletions(-) diff --git a/AST3.g3a b/AST3.g3a index 6bfd0cf9c9ba5e66acd09720deb1606438420ae4..5733b88832037f0d1508788839016fe3634218d7 100644 GIT binary patch delta 6268 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 delta 6207 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

@Jd_z8fk6v2`hpOCVka>Oh7$+y z*LC9ObCHNr+;y}8i93Mqw&RzGa-c7RaP{PBpJ=pcwBh)vJwA+iv_aT+DwbQ+E}T16 z?3oj0oX+(|p@=Lz{RhtHs-S+&w$KaJ#vLYvxW8#|Z}32uo&&n1563vS6vKMysF3q| zRK(Ij59&IidM%`v%fJIfrO?ZkgqxaQzeDsI<8j;y%gerui2u2IHF{%iYHEJqDWn2q#TA-I$IFQfJ1R5J=3i%g~o4e}41OO`L z7h@n3W{3pf+=j|;6zCg^z41_LKq!18dlqi4nwJL79zhrdT97AnztIxeT;)gVOyo_#ehTrgHF3O6$rD4`0!`taD+Vf!9VBU!>VOc_^!CJqW|XJff=vrv9^ z_40&kjFD$1i>igt(gng$e zvzxBoz_nuc`e!c?k}8DX%=FuZg0|urmUjr{H`h)ZntE==68E^g15^R2!pIk2`7>&9 z$fFP;^2-ci=9e>l7`h@EhkrNOt^2aV2MK98FARQJ!R;~%dFJKr$+BwUsQHj*(iCEO zgCjXY_pMwR4^)d8tP%ui@3fJru-8f0WF;n=fE;17bq9;<-7|!%))w{!6h)|QZG;!@ z+TsWhh z6+w%hj2<78j2>ZNc%ZqBtUnloIS5^Vlar;Z-vYRTr4hq#Zp-FN;6RNf30 diff --git a/editor/AST3generator.py b/editor/AST3generator.py index e17fb10..800b70c 100644 --- a/editor/AST3generator.py +++ b/editor/AST3generator.py @@ -67,8 +67,10 @@ def place(): pygame.draw.rect(fenetre,(255,255,255),((52*b, 52*a), (52, 52))) if grille[a][b]=="1": fenetre.blit(pygame.transform.scale(solid_0,(52,52)),(52*b,52*a)) - if grille[a][b]=="s": + if grille[a][b]=="s" and int(gravityid)==6: fenetre.blit(pygame.transform.scale(player,(39,39)),(52*b,52*a+13)) + elif grille[a][b]=="s" and int(gravityid)==7: + fenetre.blit(pygame.transform.scale(player,(39,39)),(52*b,52*a)) if grille[a][b]=="e": fenetre.blit(pygame.transform.scale(end,(52,52)),(52*b,52*a)) if grille[a][b]=="d": diff --git a/editor/levels/0.lvl b/editor/levels/0.lvl index 72e6895..ae729bc 100644 --- a/editor/levels/0.lvl +++ b/editor/levels/0.lvl @@ -1,4 +1,3 @@ 11100111111111111111111111l00000l01BB1BB1BB1BB1BB11000000001001001001001001100000000i0000010010010011b0t00000i000000001001001111111000i00000000000100111111d000i000S00S0000000100000d000i00000000000000010000d000000000000000011110000d000030000a0c0m0000110000d000030000a0c0m0000110000d000030000a0c0m0000110s00d00k0300K0a0c0m00e0111100111111111111111111116 - 7 9 \ No newline at end of file diff --git a/editor/levels/1.lvl b/editor/levels/1.lvl index 39ac62b..2e34c90 100644 --- a/editor/levels/1.lvl +++ b/editor/levels/1.lvl @@ -1 +1 @@ -10011111111dddd1111111111000111100000000000000000000011110011111111ddd100001111111001dd000ddddd111111111111001dd0t0ddddddddd11000001001dd000ddddddddd11000001001aaaaaaaaaaaaaa110s00010010000000000000e1111100100100000000000aaa11111001001000000000ddddd1111100100100000000011111100010000010000000003000000001000001000K0000030k00010011111111111111111111116 +10011111111dddd1111111111000111100000000000000000000011110011111111ddd100001111111001dd000ddddd111111111111001dd0t0ddddddddd11000001001dd000ddddddddd11000001001aaaaaaaaaaaaaa110s00010010000000000000e11d1100100100000000000aaa11111001001000000000ddddd1111100100100000000011111100010000010000000003000000001000001000K0000030k00010011111111111111111111117 \ No newline at end of file diff --git a/editor/levels/10.lvl b/editor/levels/10.lvl index 5731a44..a91fbf6 100644 --- a/editor/levels/10.lvl +++ b/editor/levels/10.lvl @@ -1 +1 @@ -111111111133111111100011111111111133311111110K01111100000100111111111000111110s000101111111000000011111110K10111111d000000011111110K1011111a001BBBBB111100000101111d0a010000011110000010111a03011d0ddd1111001ddd011d0a0d11000001111000000010a30111100e00111100000k0130ad1111aaaaa1111dd000001031111111ddd1111111111111001111111aaa11111111111110011111110001116 \ No newline at end of file +11111111t133111111100011111111111133311111110K01111100000100111111111000111110s00010i11111100000001111d110K10i11111d000000011111110K10i1111a001BBBBB11110000010i111d0a010000011110000010i11a03011d0ddd1111001ddd0i1d0a0d110000011110000000i0a30111100e00111100000k0130ad11110aa001111dd000001031111111ddd11111111111B1001111111aaa11111111111010011111110001116 \ No newline at end of file diff --git a/editor/levels/11.lvl b/editor/levels/11.lvl index 96efeeb..330c35a 100644 --- a/editor/levels/11.lvl +++ b/editor/levels/11.lvl @@ -1 +1 @@ -1ddddddddddd11dddddddddd11dddddddddd00000dd3aaaaai1dd111100000000000030000i1dd000000000001110003000i1d000001111100K000003000i1d00000S00k0000000003aBB110s000100000ddd011103atl11111331ddddddddddddddd1111ddd001dddddddd11d0S0ddd11ddd00d1dd11d000300000dd11ddd000000000000300000dd11dddaaa00000000d3S00e0dd11dddddd00S0d111d3d000ddd11ddddddddddddddddddddddd16 \ No newline at end of file +1ddddddddddd11dddddddddd11dddddddddd00000dd3aaa11i1dd111100000000000030000i1dd000000000001110003000i1d000001111100K000003000i1d00000S00k0000000003aBB110s000100000ddd011103atl11111331ddddddddddddddd1111ddd001dddddddd11d0S0ddd11ddd00d1dd11d000300000dd11ddd000000000000300000dd11dddaaa00000000d3S00e0dd11dddddd00S0d111d3d000ddd11ddddddddddddddddddddddd16 \ No newline at end of file diff --git a/editor/levels/2.lvl b/editor/levels/2.lvl index 1352339..8d2fab9 100644 --- a/editor/levels/2.lvl +++ b/editor/levels/2.lvl @@ -1,4 +1,3 @@ 10001011111011111111111111000101dd10001111dddd11110000101dd10001000000000001111101dd1aaa1000ccccddd110s00010013331000000000011dddd110010001mmmdd00000100000000010e010t0dd00000011111100011111d1dddddd1111k00000001d000111001111111111111101d00000000000111000010000100000000000000010K010000100011100000011110001000010001110000dd11110001011111011111111111117 - 5 9 \ No newline at end of file diff --git a/editor/levels/3.lvl b/editor/levels/3.lvl index e9fee69..1a01c05 100644 --- a/editor/levels/3.lvl +++ b/editor/levels/3.lvl @@ -1 +1 @@ -11001111111001111111111111000111dddd000000000100013000111dddd00000000010003300000000dd11111000010e03100000000dd03a01000011111111110000dd03a01000000001100s1dd00ddt3a0100000000110001dd00dd1110100000000110001dd0Kdd00001ddd000ddd10001dd00dd00001111100ddd10001dd00dd00001000000ddd30001dd0000000010k000000330001dd0000000010000000031d001111111001111111111117 +11001111111001111111111111000111dddd000000000100013000111dddd00000000010003300000000dd11111000010e03100000000dd03a01000011111111110000dd03a01000000001100s1dd00ddt3a0100000000110001dd00dd1110100000000110001dd0Kdd00001ddd000ddd10001dd00dd00001111100ddd10001dd00dd00001000000ddd30001dd0000000010k000000330001dd0000000010000000031d001111111001111111111117 \ No newline at end of file diff --git a/editor/levels/4.lvl b/editor/levels/4.lvl index b4e7501..04771e4 100644 --- a/editor/levels/4.lvl +++ b/editor/levels/4.lvl @@ -1,3 +1,3 @@ -1dddddd100111111111111111000000000011111000000000000000000l01100c00000000001aaaaaaa111100c00000000011dddddddddd1001aaaaaaaaa11cccccccccc1001ddddddddd1000000000001331000000aa000000000000s10e1k0000000001ccccccccc111111111113311100000000011001000000000110000000001100b0000000001100000000011t0b00000000011000K0000011111aaaaaaaaa1111111110011111ddddddddd16 +1dddddd100111111111111111000000000011111000000000000000000l01100c00000000001aaaaaaa111100c00000000011dddddddddd1001aaaaaaaaa11cccccccccc1001ddddddddd10000000000d1331000000aa000000000000s10e1k0000000001ccccccccc111111111113311100000000011001000000000110000000001100b0000000001100000000011t0b00000000011000K0000011111aaaaaaaaa1111111110011111ddddddddd16 12 1 \ No newline at end of file diff --git a/editor/levels/5.lvl b/editor/levels/5.lvl index a248016..1b981f4 100644 --- a/editor/levels/5.lvl +++ b/editor/levels/5.lvl @@ -1,4 +1,3 @@ 000000000000000000000000000000000000000000000000t000000000000000000000000000011dd111111111111111110000100000100000010000001000011cc001s0000d00000001000010000e111dd0100000dd100001001111000d0000000dd100001000001000111d000ddd1000010000000000000000ddd1000011111111111d111B11111000000000000000000000000000000000000000000000000000000000000000000000000000006 - 12 6 \ No newline at end of file diff --git a/editor/levels/7.lvl b/editor/levels/7.lvl index b72939a..f693875 100644 --- a/editor/levels/7.lvl +++ b/editor/levels/7.lvl @@ -1 +1 @@ -111001111111100d0d0011111100000111ddd000d0d0000001100000000000000dtd00000e1111111ddd111111111111111100000000000000000000d0000111111111dd111110100d000110001100000000010100d0001000011000000000d0d00d0000000000000000000d0d00d00001111dd111000000dld00111111000011111ddd00d0d00111111000011111ddd00d0d001111110s0011111ddd00d0d0011111111001111111100d0d00111116 +111001111111100d0d0011111100000111ddd000d0d0000001100000000000000dtd00000e1111111ddd111111111111111100000000000000000000d0000111111111dd111110100d000110001100000000010100d0001000011000000000d0d00d0000000000000000000d0d00d00001111dd111000000dld00111111000011111ddd00d0d0011111d000011111ddd00d0d0011111d0s0011111ddd00d0d0011111111001111111100d0d00111116 diff --git a/editor/levels/8.lvl b/editor/levels/8.lvl index b567dba..6cc6d35 100644 --- a/editor/levels/8.lvl +++ b/editor/levels/8.lvl @@ -1 +1 @@ -dddddddddddddddddddddddddBBBBBBBBBBBBBBBBBBBBBBBBB100001kk10011111dt0a000011000010010010000d11a00001100001BB100100000000000013000000000010001110000000300000000001aaaaaa00000001111110000010000000011111100000000001000000001000110000000a001BBBd00a0100013000000000010001000010003300s000000010K0100001e003aaBBBBBBBBBBBBBBBBBBBaaaaddddddddddddddddddddddddd6 \ No newline at end of file +dddddddddddddddddddddddddBBBBBBBBBBBBBBBBBBBBBBBBB100001kk10011111dt0a000011000010010010000d11a00001100001BB100100000000000013000000000010001110000000300000000001aaaaaa0000000111111000001000000001111110dd00000001000000001000110000000a001BBBd00a0100013000000000010001000010003300s000000010K0100001e003aaBBBBBBBBBBBBBBBBBBBaaaaddddddddddddddddddddddddd6 \ No newline at end of file diff --git a/editor/levels/9.lvl b/editor/levels/9.lvl index baf3c31..dabd977 100644 --- a/editor/levels/9.lvl +++ b/editor/levels/9.lvl @@ -1 +1 @@ -00000ddddddd100000000000011111111111111111110011111000000dd1111ddd0K10000b1100111000000100000100000110000100000010000010010011000k111dd101dd00d10000011000110000001000001BBBB011000100011dd1000001dddd01100010ddd1dd1d00dd1011001133310ddd1dd1000001t00001100000ddd1dd1BBBBB1ddd1111s0000ddd1dd10000011111111BBB111aaaaa110001111111100000000000e10000000000006 \ No newline at end of file +00000ddddddd100000000000011111111111111111110011111000000dd1111ddd0K10000b1100111000000100000100000110000100000010000010010011000k111dd101dd00d10000011000110000001000001BBBB011000100011dd1000001dddd01100010ddd1dd1d00dd1011001133310ddd1dd1BBBBB1t00001100000ddd1dd1000001ddd1111s0000ddd1dd10000011111111BBB111aaaaa110001111111100000000000e10000000000006 \ No newline at end of file diff --git a/src/main.c b/src/main.c index bbca2cd..d3b3ba7 100644 --- a/src/main.c +++ b/src/main.c @@ -12,10 +12,9 @@ #include "define.h" #define VACCELERATION 0.2 -#define HACCELERATION 0.01 +#define HACCELERATION 0.4 #define MAX_VSPD 9.0 -//#define MAX_HSPD 3.0 -#define FRICTION 0.06 +#define FRICTION 0.2 int main(void); @@ -25,6 +24,11 @@ int callback(volatile int *frame_elapsed) return TIMER_CONTINUE; } +int round(float num) //round(2.5) = 3 round(-3.2) = -3 +{ + return num < 0 ? num - 0.5 : num + 0.5; +} + void game(int *id_level, char mode) { volatile int frame_elapsed = 1; @@ -49,7 +53,8 @@ void game(int *id_level, char mode) int disappear = 13; float vspd = 1.0; - //float hspd = 2.0; + float hspd = 0; + extern bopti_image_t img_speedrun; set_level(*id_level, level, &start_x, &start_y, &gravity, &appear, &disappear); @@ -81,8 +86,6 @@ void game(int *id_level, char mode) } //dprint(150,100,C_GREEN,"%d",player_x); //dprint(150,120,C_GREEN,"%d",player_y); - //dprint(150,120,C_GREEN,"%.2j",(int)(hspd*100)); - dprint(150,120,C_GREEN,"%.2j",(int)(vspd*100)); if(!mode) dprint_opt(340, 0, C_RGB(255,190,0), C_BLACK, DTEXT_LEFT, DTEXT_TOP, "Coin : %d", coin); /*dprint(320,120,C_GREEN,"%d",collide_solid(player_x+1, player_y, level)); dprint(320,140,C_GREEN,"%d",collide_solid(player_x-1, player_y, level)); @@ -98,54 +101,26 @@ void game(int *id_level, char mode) } pollevent(); + //Right collision if(keydown(KEY_RIGHT)) { - /*if(!collide_solid(player_x+(int)hspd+1, player_y, level)) - { - if (hspd=388) player_x=-4; - } //Left collision else if(keydown(KEY_LEFT)) { - /*if(!collide_solid(player_x-(int)hspd-1, player_y, level)) - { - if (hspd