From 92b22c52ff9ecc66918eacd18424066684f14189 Mon Sep 17 00:00:00 2001 From: Tituya Date: Sun, 19 Jul 2020 01:13:01 +0200 Subject: [PATCH] Correction timer + nouveau niveau + fps constant --- AST3.g3a | Bin 60116 -> 60488 bytes editor/levels/2.lvl | 2 +- editor/levels/4.lvl | 1 + editor/levels/5.lvl | 1 + include/define.h | 2 +- src/main.c | 60 ++++++++++++++++++++++++++++---------------- src/setlevel.c | 14 ++++++++++- 7 files changed, 55 insertions(+), 25 deletions(-) create mode 100644 editor/levels/4.lvl create mode 100644 editor/levels/5.lvl diff --git a/AST3.g3a b/AST3.g3a index bd9eb1d916b0c64b5fef539d4cd54df978b06f07..3474d88a6e81f3afad35facc325c42f79ab53639 100644 GIT binary patch delta 8613 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 Gi~j>?cKPA} delta 8341 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 diff --git a/editor/levels/2.lvl b/editor/levels/2.lvl index b34d61f..f922b59 100644 --- a/editor/levels/2.lvl +++ b/editor/levels/2.lvl @@ -1 +1 @@ -111001111111100d0d0011111100000111ddd000d0d0000001100000000000000dtd00000e1111111ddd111111111111111100000000000000000l00d0000111111111dd111110100d000110001100000000010100d0001000011000000000d0d00d000000000l000000000d0d00d00001111dd111000000d0d00111111000011111ddd00d0d00111111000011111ddd00d0d001111110s0011111ddd00d0d0011111111001111111100d0d00111116 \ No newline at end of file +111001111111100d0d0011111100000111ddd000d0d0000001100000000000000dtd00000e1111111ddd111111111111111100000000000000000l00d0000111111111dd111110100d000110001100000000010100d0001000011000000000d0d00d00000000l0000000000d0d00d00001111dd111000000d0d00111111000011111ddd00d0d00111111000011111ddd00d0d001111110s0011111ddd00d0d0011111111001111111100d0d00111116 \ No newline at end of file diff --git a/editor/levels/4.lvl b/editor/levels/4.lvl new file mode 100644 index 0000000..b0ead9c --- /dev/null +++ b/editor/levels/4.lvl @@ -0,0 +1 @@ +1dddddd100111111111111111000000000011111000000000000000000l01100c00000000001aaaaaaa111100c00000000011dddddddddd1001aaaaaaaaa11cccccccccc1001ddddddddd1000000000001331000000aa000000000000s10e1k0000000001ccccccccc111111111113311100000000001001000000000110000000000100b0000000001100000000001t0b00000000011000K0000001111aaaaaaaaa1111111110011111ddddddddd16 \ No newline at end of file diff --git a/editor/levels/5.lvl b/editor/levels/5.lvl new file mode 100644 index 0000000..724cde1 --- /dev/null +++ b/editor/levels/5.lvl @@ -0,0 +1 @@ +11111111111111111111111111000000000000000000000001100000000000000000000000110ddd0ddd000d0d0d00000001100d0d0d0d0d0d0d0d0000001100d0d0d0d0d0d0ddd0000001100d0d0d0ddd0d0d0d00000011000000000000000000000001100000000000000000000000110000000000000000000000011000000000000000000000001100000000000000000000000110s0000000000000000000e0111111111111111111111111116 \ No newline at end of file diff --git a/include/define.h b/include/define.h index 1e7a938..003b806 100644 --- a/include/define.h +++ b/include/define.h @@ -1,3 +1,3 @@ -#define PLAYER_SPEED 3 +#define PLAYER_SPEED 2 #define PLAYER_HEIGHT 11 #define FPS 60 diff --git a/src/main.c b/src/main.c index ce4c468..d52e933 100644 --- a/src/main.c +++ b/src/main.c @@ -9,7 +9,7 @@ #include "collide.h" #include "define.h" -#define ACCELERATION 0.4 +#define ACCELERATION 0.2 #define MAX_VSPD 9.0 int callback(volatile int *frame_elapsed) @@ -53,10 +53,13 @@ int main(void) frame++; framelevel++; - draw_level(level); - if(blackout) draw_blackout(player_x, player_y); - draw_player(player_x,player_y); - draw_timer(frame); + if(!(frame%2)) + { + draw_level(level); + if(blackout) draw_blackout(player_x, player_y); + draw_player(player_x,player_y); + draw_timer(frame); + if(id_level==1) { dprint(85,180,C_RGB(245,245,0),"SHIFT"); @@ -65,21 +68,22 @@ int main(void) dprint(162,173,C_RGB(110,110,110),"sur certains blocs"); dprint(315,115,C_RGB(110,110,110),"Bravo !"); } - dprint(150,100,C_GREEN,"%d",player_x); - dprint(150,120,C_GREEN,"%d",player_y); - 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, gravity)); - dprint(320,140,C_GREEN,"%d",collide_solid(player_x-1, player_y, level, gravity)); - dprint(320,160,C_GREEN,"%d",collide_solid(player_x, player_y+1, level, gravity)); - dprint(320,180,C_GREEN,"%d",collide_solid(player_x, player_y-1, level, gravity));*/ - - /*dprint(300,100,C_GREEN,"%d",collide_dead(player_x, player_y, level)); - dprint(300,120,C_GREEN,"%c",level[(int)((player_x-1)/16)+(int)((player_y-1)/16*25)]); //top left - dprint(300,140,C_GREEN,"%c",level[(int)((player_x+PLAYER_HEIGHT+1)/16)+(int)((player_y-1)/16*25)]); //top right - dprint(300,160,C_GREEN,"%c",level[(int)((player_x-1)/16)+(int)((player_y+PLAYER_HEIGHT+1)/16*25)]); //bottom left - dprint(300,180,C_GREEN,"%c",level[(int)((player_x+PLAYER_HEIGHT+1)/16)+(int)((player_y+PLAYER_HEIGHT+1)/16*25)]); //bottom right*/ - - dupdate(); + dprint(150,100,C_GREEN,"%d",player_x); + dprint(150,120,C_GREEN,"%d",player_y); + 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, gravity)); + dprint(320,140,C_GREEN,"%d",collide_solid(player_x-1, player_y, level, gravity)); + dprint(320,160,C_GREEN,"%d",collide_solid(player_x, player_y+1, level, gravity)); + dprint(320,180,C_GREEN,"%d",collide_solid(player_x, player_y-1, level, gravity));*/ + + /*dprint(300,100,C_GREEN,"%d",collide_dead(player_x, player_y, level)); + dprint(300,120,C_GREEN,"%c",level[(int)((player_x-1)/16)+(int)((player_y-1)/16*25)]); //top left + dprint(300,140,C_GREEN,"%c",level[(int)((player_x+PLAYER_HEIGHT+1)/16)+(int)((player_y-1)/16*25)]); //top right + dprint(300,160,C_GREEN,"%c",level[(int)((player_x-1)/16)+(int)((player_y+PLAYER_HEIGHT+1)/16*25)]); //bottom left + dprint(300,180,C_GREEN,"%c",level[(int)((player_x+PLAYER_HEIGHT+1)/16)+(int)((player_y+PLAYER_HEIGHT+1)/16*25)]); //bottom right*/ + + dupdate(); + } pollevent(); if(keydown(KEY_RIGHT)) @@ -104,12 +108,18 @@ int main(void) else if(!keydown(KEY_SHIFT) && check) check=0; if(!gravity) { - if(!collide_solid(player_x, player_y+vert_spd, level, gravity)) + if(!collide_solid(player_x, player_y+vert_spd+1, level, gravity)) { if (vspd