diff --git a/SuperCbr.g1a b/SuperCbr.g1a index ee1069f..bae469f 100644 Binary files a/SuperCbr.g1a and b/SuperCbr.g1a differ diff --git a/assets-fx/bin/lvl_1_2.png b/assets-fx/bin/lvl_1_2.png index d313442..b7c837d 100644 Binary files a/assets-fx/bin/lvl_1_2.png and b/assets-fx/bin/lvl_1_2.png differ diff --git a/levelconverter/levelconv.py b/levelconverter/levelconv.py index 02c55da..fcfb66c 100644 --- a/levelconverter/levelconv.py +++ b/levelconverter/levelconv.py @@ -38,7 +38,7 @@ def write_char(val): # Load image filename = input("File name ?\n> ") img = Image.open(filename) -print("Converting " + filename + " to assets-fx/" + filename + " //size =", img.size) +print("Converting..." + filename + ", size =", img.size) #rough binary # code = str().encode('latin1') @@ -46,12 +46,6 @@ code = write_char(int(img.size[0])) code += write_char(int(img.size[1])) - -nombre_ennemis=0 -ennemis = "\nennemi_t ennemies0[]={" - - -# Balayage des pixels : passe pour dessiner les murs pixels = img.load() for x in range(0,img.size[0]): for i in range(0, img.size[1]): @@ -86,20 +80,22 @@ for x in range(0,img.size[0]): elif color_compare(pixels[x,y], tuyau_milieu): code += write_char(9) + elif color_compare(pixels[x,y], drapeau): - code += write_char(10) # temporary code+= "{END_LEVEL,0x1102}," + code += write_char(10) + + elif color_compare(pixels[x,y], goomba): + code += write_char(11) + + elif color_compare(pixels[x,y], koopa_vert): + code += write_char(12) + + elif color_compare(pixels[x,y], koopa_rouge): + code += write_char(13) + else: code += write_char(0) - #code += str(pixels[x,y]) - if color_compare(pixels[x,y], goomba): - nombre_ennemis += 1 - ennemis += "\n GOOMBA(" + str(8*x) + ", " + str(8*i) + ", -1)," - elif color_compare(pixels[x,y], koopa_vert): - ennemis += "\n KOOPA_V(" + str(8*x) + ", " + str(8*i) + ", -1)," - elif color_compare(pixels[x,y], koopa_rouge): - ennemis += "\n KOOPA_R(" + str(8*x) + ", " + str(8*i) + ", -1)," -ennemis += "\n};\nennemis_global_size=" + str(nombre_ennemis) + ";\ninit_ennemies(ennemies0);\n" f = open("../assets-fx/bin/lvl_"+filename, 'wb') f.write(code) diff --git a/src/level.c b/src/level.c index bf03a66..25f14e6 100644 --- a/src/level.c +++ b/src/level.c @@ -23,12 +23,15 @@ #define PACKED_BOX_COIN 5 #define PACKED_BOX_CHAMPI 6 #define PACKED_BETON 7 - #define PACKED_TUYAU_BOUT 8 #define PACKED_TUYAU_MIDDLE 9 - #define PACKED_FLAG 10 + +#define PACKED_GOOMBA 11 +#define PACKED_KOOPA_VERT 12 +#define PACKED_KOOPA_ROUGE 13 + void malloc_error() { extern image_t img_ram; @@ -89,6 +92,11 @@ static void unpack_level(packed_level_t * p) int sx=0, sy=p->height; // Mario start coords ll_sendp(LEVEL_INFO, "\n[i]Converting...", w,h); + + ennemi_t ennemis[20]={0}; + int nombre_ennemis=0; + + for (unsigned int x=0; x