diff --git a/AST3.g3a b/AST3.g3a index dc0b8f0..f33a905 100644 Binary files a/AST3.g3a and b/AST3.g3a differ diff --git a/compile_level.py b/compile_level.py index ab04313..dcc8c67 100644 --- a/compile_level.py +++ b/compile_level.py @@ -1,7 +1,7 @@ ids = 0 save = open("src/setlevel.c","w+") -save.write("#include \"setlevel.h\"\n#include \nvoid set_level(int id_level, char level[], int *startx, \ +save.write("#include \"setlevel.h\"\n#include \n#include \nvoid set_level(int id_level, char level[], int *startx, \ int *starty, char *gravity, int *appear, int *disappear){\nswitch(id_level){") while 1: try: @@ -44,5 +44,20 @@ while 1: ids+=1 except FileNotFoundError: break + +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]="" + + save.write("}}\nvoid del_level(char level[])\n{memcpy(level,\"\ -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\",350);}") +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 diff --git a/editor/AST3generator.py b/editor/AST3generator.py index 705e973..d36b9c8 100644 --- a/editor/AST3generator.py +++ b/editor/AST3generator.py @@ -227,17 +227,7 @@ while securite==False: if event.button == 3: x=int(event.pos[0]/52) y=int(event.pos[1]/52) - if lock!="": - grille[y][x]="0" - else: - for i in range(len(suite)): - if grille[y][x] == suite[i]: - if i!=len(suite)+1: - grille[y][x]=suite[i-1] - break - else: - grille[y][x]=suite[len(suite)] - break + grille[y][x]="0" pygame.draw.rect(fenetre,(255,255,255),((52*x, 52*y), (55, 55))) place() write() \ No newline at end of file diff --git a/editor/levels/7.lvl b/editor/levels/7.lvl index d10e62f..70b5714 100644 --- a/editor/levels/7.lvl +++ b/editor/levels/7.lvl @@ -1 +1 @@ -111001111111100i0d0011111100000111ddd000i0d0000001100000000000000itd00000e1111111ddd111111111111111100000000000000000h00d0000111111111dd111110100d000110001100000000010100d0001000011000000000i0d00d0000000000000000000i0d00d00001111dd111000000ild00111111000011111ddd00i0d0011111d000011111ddd00i0d0011111d0s0011111ddd00i0d0011111111001111111100i0d00111116 +111001111111100i0d0011111100000111ddd000i0d0000001100000000000000itd00000e1111111ddd111111111111111100000000000000000h00d0000111111111dd111110100d000110001100000000010100d0001000011000000000i0d00d0000000000000000000i0d00d00001111dd111000000ild00111111000011111ddd00i0d0011111d000011111ddd00i0d0011111d0s0011111ddd00i0d0011111111001111111100i0d00111116 \ No newline at end of file diff --git a/include/setlevel.h b/include/setlevel.h index 09df303..c7b740c 100644 --- a/include/setlevel.h +++ b/include/setlevel.h @@ -1,3 +1,4 @@ void set_level(int id_level, char level[], int *startx, int *starty, char *gravity, int *appear, int *disappear); void set_gravity(int id_level, char *default_gravity); void del_level(char level[]); +void set_levelname(int id_level); diff --git a/levelname.py b/levelname.py new file mode 100644 index 0000000..7b83670 --- /dev/null +++ b/levelname.py @@ -0,0 +1,11 @@ +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/menu.c b/src/menu.c index bbeda08..9b68772 100644 --- a/src/menu.c +++ b/src/menu.c @@ -80,6 +80,7 @@ char speed_menu(int *id_level) dprint(80,20,C_BLACK,"Level : %d",*id_level); if(sto != 0) dprint(194,60,C_RED, "%.2j", sto); else dprint(202,60,C_RED, "/"); + set_levelname(*id_level); if(*id_level == 14) dprint_opt(180, 8, C_RGB(0,255,255), C_BLACK, DTEXT_LEFT, DTEXT_TOP, "VVVVVV"); dupdate(); if (keydown_any(KEY_SHIFT, KEY_EXE, 0)) diff --git a/src/setlevel.c b/src/setlevel.c index d79e508..22d1885 100644 --- a/src/setlevel.c +++ b/src/setlevel.c @@ -1,5 +1,6 @@ #include "setlevel.h" #include +#include 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,"111111111111111111111111100000000c300000000000100000000000c3000000K0k0l1000111ddd1111aaa111111111h11111ddd1111aaa1ddddd00000110000001110001d000000000110s00001110001d000000000111111001110001d0011d1100110b01001110001d00e000000110S01001110001d000000000110001001110001d011111000100t01000m00001d000000000000001000m00001ddddd0000001111111111111111111111111",350); @@ -126,4 +127,10 @@ case 15: break; }} void del_level(char level[]) -{memcpy(level,"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",350);} \ No newline at end of file +{memcpy(level,"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",350);} + +void set_levelname(int id_level) +{ +char *levelname[] = {"Tituya","Tituya","Massena","Tituya","Tituya","Tituya","Tituya","Tituya","Massena","Tituya","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 9763ad6..eca2fd7 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.86,8.76,5.80,3.52,3.58,8.62,6.73,7.65,9.62,6.04,6.23,10.78,5.39,8.35,7.45}; +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}; 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.86,8.76,5.80,3.52,3.58,8.62,6.73,7.65,9.62,6.04,6.23,10.78,5.39,8.35,7.45}; +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}; time = level_time[id_level-1]; dsubimage(172,90,&img_medals,36,0,12,12,DIMAGE_NONE); diff --git a/time.py b/time.py index b6fbb93..a07497d 100644 --- a/time.py +++ b/time.py @@ -4,10 +4,14 @@ bronze = 2 f = open("times.lvl","r+") d = open("src/times.c","w") +lvm = open(f"include/define.h","r") ids=f.readlines() times=[] -for i in ids: times.append(i.rstrip()) - +for i in ids: + times.append(i.rstrip()) +for i in range(int(''.join(list(filter(str.isdigit, lvm.readline()))))): + hop=times[i].find("-") + if hop!=-1: times[i]=times[i][:hop] d.write("#include \"times.h\"\n\ #include \"define.h\"\n\ #include \n\ diff --git a/times.lvl b/times.lvl index 618de9e..d5bec17 100644 --- a/times.lvl +++ b/times.lvl @@ -1,15 +1,15 @@ -5.86 -8.76 -5.80 -3.52 -3.58 -8.62 -6.73 -7.65 -9.62 -6.04 -6.23 -10.78 -5.39 -8.35 -7.45 +5.85-Tituya +8.67-Tituya +5.64-Massena +3.50-Tituya +3.54-Tituya +8.42-Tituya +6.67-Tituya +7.60-Tituya +9.20-Massena +5.77-Tituya +6.04-Tituya +10.38-Tituya +5.34-Tituya +7.67-Tituya +6.24-Tituya