From e671d8324ca7e21f81d29301976eb13036d9f2a5 Mon Sep 17 00:00:00 2001 From: Tituya Date: Sat, 29 Aug 2020 16:11:30 +0200 Subject: [PATCH] editeur clic droit --- AST3.g3a | Bin 195000 -> 195176 bytes compile_level.py | 19 +++++++++++++++++-- editor/AST3generator.py | 12 +----------- editor/levels/7.lvl | 2 +- include/setlevel.h | 1 + levelname.py | 11 +++++++++++ src/menu.c | 1 + src/setlevel.c | 9 ++++++++- src/times.c | 4 ++-- time.py | 8 ++++++-- times.lvl | 30 +++++++++++++++--------------- 11 files changed, 63 insertions(+), 34 deletions(-) create mode 100644 levelname.py diff --git a/AST3.g3a b/AST3.g3a index dc0b8f08e4f31acb6f9fc629787f947a77c782b6..f33a905d2b45323d2719e67cac09b16a16f01f1c 100644 GIT binary patch delta 4176 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 Xo3QbF%X;PYQq|txUil-r_|ks>gZu7k delta 3992 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 O*x{PH@;UkGpZ^1xe#Mpm 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