diff --git a/AST3.g3a b/AST3.g3a index 7e341e0..536404a 100644 Binary files a/AST3.g3a and b/AST3.g3a differ diff --git a/assets-cg/img/end.png b/assets-cg/img/end.png index 5a5b1a9..d90d315 100644 Binary files a/assets-cg/img/end.png and b/assets-cg/img/end.png differ diff --git a/assets-cg/img/menu.png b/assets-cg/img/menu.png index 0e6b690..2d96b57 100644 Binary files a/assets-cg/img/menu.png and b/assets-cg/img/menu.png differ diff --git a/assets-cg/img/solid_0.png b/assets-cg/img/solid_0.png index 2326528..2d3bd5e 100644 Binary files a/assets-cg/img/solid_0.png and b/assets-cg/img/solid_0.png differ diff --git a/compile_level.py b/compile_level.py index dcc8c67..67ba728 100644 --- a/compile_level.py +++ b/compile_level.py @@ -60,4 +60,8 @@ for i in range(int(''.join(list(filter(str.isdigit, lvm.readline()))))): save.write("}}\nvoid del_level(char level[])\n{memcpy(level,\"\ 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\",350);}\n\n\ void set_levelname(int id_level)\n{\nchar *levelname[] = {") -save.write(("\""+'","'.join(names)+'"};\ndprint_opt(180, 25, C_RED, C_BLACK, DTEXT_LEFT, DTEXT_TOP, \"%s\", levelname[id_level-1]);\n}')) \ No newline at end of file +save.write(("\""+'","'.join(names)+'"};\ndprint_opt(180, 25, C_RED, C_BLACK, DTEXT_LEFT, DTEXT_TOP, \"%s\", levelname[id_level-1]);\n}')) + +#copy the textures from editor +import shutil +shutil.copytree("editor/img","assets-cg/img", dirs_exist_ok=True) \ No newline at end of file diff --git a/editor/AST3generator.py b/editor/AST3generator.py index 236f085..39d20a5 100644 --- a/editor/AST3generator.py +++ b/editor/AST3generator.py @@ -68,9 +68,9 @@ def place(): if grille[a][b]=="1": fenetre.blit(pygame.transform.scale(solid_0,(52,52)),(52*b,52*a)) if grille[a][b]=="s" and int(gravityid)==6: - fenetre.blit(pygame.transform.scale(player,(39,39)),(52*b,52*a+13)) + fenetre.blit(pygame.transform.scale(player.subsurface((0,0),(12,12)),(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)) + fenetre.blit(pygame.transform.scale(player.subsurface((0,0),(12,12)),(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/img/player.png b/editor/img/player.png index 00e04d2..f1b2206 100644 Binary files a/editor/img/player.png and b/editor/img/player.png differ diff --git a/editor/levels/0.lvl b/editor/levels/0.lvl index bc4b8a0..e7caef7 100644 --- a/editor/levels/0.lvl +++ b/editor/levels/0.lvl @@ -1,4 +1,3 @@ 111111111111111111111111100000000c300000000000100000000000c3000000K0k0l1000111ddd1111aaa111111111h11111ddd1111aaa1ddddd00000110000001110001d000000000110s00001110001d000000000111111001110001d0011d1100110b01001110001d00e000000110S01001110001d000000000110001001110001d011111000100t01000m00001d000000000000001000m00001ddddd00000011111111111111111111111116 - 9 13 \ No newline at end of file diff --git a/levelname.py b/levelname.py deleted file mode 100644 index 7b83670..0000000 --- a/levelname.py +++ /dev/null @@ -1,11 +0,0 @@ -f = open("times.lvl","r+") -lvm = open(f"include/define.h","r") -ids=f.readlines() -names=[] -for i in ids: - names.append(i.rstrip()) -for i in range(int(''.join(list(filter(str.isdigit, lvm.readline()))))): - hop=names[i].find("-") - if hop!=-1: names[i]=names[i][hop+1:] - else: names[i]="" -print(names) \ No newline at end of file diff --git a/src/drawlevel.c b/src/drawlevel.c index bd0e66b..2c0f37d 100644 --- a/src/drawlevel.c +++ b/src/drawlevel.c @@ -129,7 +129,8 @@ void draw_blackout(int x, int y) void draw_timer(unsigned int frame) { - dprint_opt(0, 0, C_WHITE, C_BLACK, DTEXT_LEFT, DTEXT_TOP, "%u.%02u",(frame)/FPS, (frame)%FPS); + float framefloat = frame; + dprint_opt(0, 0, C_WHITE, C_BLACK, DTEXT_LEFT, DTEXT_TOP, "%.2j", (int)(framefloat/FPS*100)); } void draw_end(int framelevel, int id_level, char record) diff --git a/src/setlevel.c b/src/setlevel.c index e0c673b..9a5b44e 100644 --- a/src/setlevel.c +++ b/src/setlevel.c @@ -131,6 +131,6 @@ void del_level(char level[]) void set_levelname(int id_level) { -char *levelname[] = {"Tituya","Tituya","Massena","Tituya","Tituya","Tituya","Tituya","Tituya","Massena","Tituya","Tituya","Tituya","Tituya","Tituya","Tituya"}; +char *levelname[] = {"KikooDX","KikooDX","KikooDX","KikooDX","KikooDX","KikooDX","KikooDX","KikooDX","Massena","Massena","Tituya","Tituya","Tituya","Tituya","Tituya"}; dprint_opt(180, 25, C_RED, C_BLACK, DTEXT_LEFT, DTEXT_TOP, "%s", levelname[id_level-1]); } \ No newline at end of file diff --git a/src/times.c b/src/times.c index eca2fd7..7747fc2 100644 --- a/src/times.c +++ b/src/times.c @@ -8,7 +8,7 @@ void check_medal(unsigned int frame_level, int id_level, int x, int y) { float time=1.0; float framefloat = frame_level; -float level_time[] = {5.85,8.67,5.64,3.50,3.54,8.42,6.67,7.60,9.20,5.77,6.04,10.38,5.34,7.67,6.24}; +float level_time[] = {5.80,8.62,5.14,3.22,3.25,8.20,6.60,7.18,9.20,5.22,6.04,10.38,5.34,7.61,6.05}; time = level_time[id_level-1]; if(frame_level/FPS < (unsigned int)time || (frame_level/FPS <= (unsigned int)time && @@ -25,7 +25,7 @@ void draw_time(int id_level) { dclear(C_WHITE); float time=1.0; -float level_time[] = {5.85,8.67,5.64,3.50,3.54,8.42,6.67,7.60,9.20,5.77,6.04,10.38,5.34,7.67,6.24}; +float level_time[] = {5.80,8.62,5.14,3.22,3.25,8.20,6.60,7.18,9.20,5.22,6.04,10.38,5.34,7.61,6.05}; time = level_time[id_level-1]; dsubimage(172,90,&img_medals,36,0,12,12,DIMAGE_NONE);