modifs textures, nouveau+modifs niveaux + niveau de test

This commit is contained in:
Tituya 2020-08-14 01:21:32 +02:00
parent 542c8474e6
commit e43151aa29
18 changed files with 64 additions and 22 deletions

BIN
AST3.g3a

Binary file not shown.

BIN
assets-cg/img/chock.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 599 B

After

Width:  |  Height:  |  Size: 582 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 259 B

View File

@ -1,4 +1,4 @@
ids = 1
ids = 0
save = open("src/setlevel.c","w+")
save.write("#include \"setlevel.h\"\n#include <gint/std/string.h>\nvoid set_level(int id_level, char level[], int *startx, \
@ -32,7 +32,7 @@ if(x==16*25){x=0;\n\
y+=16;}i++;}}\n\
void set_gravity(int id_level, char *default_gravity){\n\
switch(id_level){")
ids = 1
ids = 0
gravity = 0
while 1:
try:

View File

@ -56,8 +56,8 @@ def place():
level = font.render(str(id_level),1,(0,0,0))
if int(gravityid)==6: levelgr = font.render("",1,(120,0,0))
if int(gravityid)==7: levelgr = font.render("",1,(0,120,120))
timeapp = font.render("A="+str(app),1,(255,180,0))
timedisa = font.render("D="+str(disa)+" LOCK : "+str(lock),1,(0,255,100))
timeapp = font.render("A="+str(app),1,(255,230,0))
timedisa = font.render("D="+str(disa)+" LOCK : "+str(lock),1,(255,180,0))
for a in range(14):
for b in range(25):
pygame.draw.rect(fenetre,(255,255,255),((52*b, 52*a), (52, 52)))
@ -97,6 +97,7 @@ def place():
fenetre.blit(levelgr, (10, 60))
fenetre.blit(timeapp, (55, 10))
fenetre.blit(timedisa, (140, 10))
if id_level==0 : fenetre.blit(font.render("NIVEAU DE TEST",1,(0,180,255)), (600,10))
pygame.display.flip()
def write():
@ -114,29 +115,29 @@ pygame.display.set_caption('AST3 generator (Tituya)')
fenetre = pygame.display.set_mode((25*52, 14*52))
font = pygame.font.SysFont('arial',25,True)
#Defini la suite des blocs pendant les changements (cliquer sur un 1 va donner un 2, cliquer sur un 11 un 0...)
#Defini la suite des blocs pendant les changements (cliquer sur un 1 va donner un 2...)
suite=["0","1","d","s","e","k","3","K","a","c","m","t","l","b","B"]
id_level = 1
id_level = 0
gravityid = 6
disa = 10
app = 13
lock=""
solid_0 = pygame.image.load("editor/img/solid_0.png").convert()
player = pygame.image.load("editor/img/player.png").convert()
keyblock = pygame.image.load("editor/img/keyblock.png").convert()
key2block = pygame.image.load("editor/img/key2block.png").convert()
chrono1 = pygame.image.load("editor/img/chrono1.png").convert()
chrono2 = pygame.image.load("editor/img/chrono2.png").convert()
solid_0 = pygame.image.load("editor/img/solid_0.png").convert_alpha()
player = pygame.image.load("editor/img/player.png").convert_alpha()
keyblock = pygame.image.load("editor/img/keyblock.png").convert_alpha()
key2block = pygame.image.load("editor/img/key2block.png").convert_alpha()
chrono1 = pygame.image.load("editor/img/chrono1.png").convert_alpha()
chrono2 = pygame.image.load("editor/img/chrono2.png").convert_alpha()
key1 = pygame.image.load("editor/img/key1.png").convert_alpha()
key2 = pygame.image.load("editor/img/key2.png").convert_alpha()
end = pygame.image.load("editor/img/end.png").convert_alpha()
dead = pygame.image.load("editor/img/dead.png").convert()
dead = pygame.image.load("editor/img/dead.png").convert_alpha()
coin = pygame.image.load("editor/img/coin.png").convert_alpha()
change = pygame.image.load("editor/img/change.png").convert_alpha()
blackout = pygame.image.load("editor/img/blackout.png").convert_alpha()
damaged = pygame.image.load("editor/img/damaged.png").convert()
damaged = pygame.image.load("editor/img/damaged.png").convert_alpha()
@ -155,7 +156,7 @@ while securite==False:
load(id_level)
place()
if carac == "q":
if id_level!=1: id_level-=1
if id_level!=0: id_level-=1
load(id_level)
place()
if carac == "z":

Binary file not shown.

Before

Width:  |  Height:  |  Size: 265 B

After

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 631 B

After

Width:  |  Height:  |  Size: 259 B

BIN
editor/img/key2block4.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 631 B

4
editor/levels/0.lvl Normal file
View File

@ -0,0 +1,4 @@
11100111111111111111111111l00000l01BB1BB1BB1BB1BB1100000000000100100100100110000000000000010010010011b0t000000000000001001001111111000000000000000100111111d000000000000000000100000d000000000000000000010000d000000000000000011110000d000030000a0c0m0000110000d000030000a0c0m0000110000d000030000a0c0m0000110s00d00k0300K0a0c0m00e0111100111111111111111111116
7
9

View File

@ -1,4 +1,4 @@
11111111111011111dddd1111100001dd0000dd100000000011s0001dd0d11dd10000000001111001dd0d111dd00111100011dd001dt0d10000001dd100011dd001d11d10000001dd100011dd00dd11110011111dd100011dd00000000001dddddd100011dd1111dbd1111ddd111100011ddddddd0dd1d1ddd100000011ddddddd0000d1ddd1e0000011ddddddd1110d1ddd111cccc11dddddddddd0d1ddd111dddd111111111111011111111111116
12
7
13

View File

@ -1 +1 @@
111001111111100d0d0011111100000111ddd000d0d0000001100000000000000dtd00000e1111111ddd111111111111111100000000000000000l00d0000111111111dd111110100d000110001100000000010100d0001000011000000000d0d00d00000000l0000000000d0d00d00001111dd111000000d0d00111111000011111ddd00d0d00111111000011111ddd00d0d001111110s0011111ddd00d0d0011111111001111111100d0d00111116
111001111111100d0d0011111100000111ddd000d0d0000001100000000000000dtd00000e1111111ddd111111111111111100000000000000000000d0000111111111dd111110100d000110001100000000010100d0001000011000000000d0d00d0000000000000000000d0d00d00001111dd111000000dld00111111000011111ddd00d0d00111111000011111ddd00d0d001111110s0011111ddd00d0d0011111111001111111100d0d00111116

1
editor/levels/9.lvl Normal file
View File

@ -0,0 +1 @@
00000ddddddd100000000000011111111111111111110011111000000dd1111ddd0K10000b1100111000000100000100000110000100000010000010010011000k111dd101dd00d10000011000110000001000001BBBB011000100011dd1000001dddd01100010ddd1dd1d00dd1011001133310ddd1dd1BBBBB1t00001100000ddd1dd1000001ddd1111s0000ddd1dd10000011111111BBB111aaaaa110001111111100000000000e10000000000006

View File

@ -17,7 +17,9 @@ extern bopti_image_t img_chrono1; //chronoblock
extern bopti_image_t img_chrono2; //chronoblock 2
extern bopti_image_t img_key2; //key 2
extern bopti_image_t img_key2block; //block link to the key 2
extern bopti_image_t img_key2blockvoid; //block link to the key 2
extern bopti_image_t img_damaged; //damaged block
extern bopti_image_t img_chock; //chock block
void draw_player(int x, int y)
{
@ -51,6 +53,9 @@ void draw_level(char level[])
case 'k': //key1
dimage(x,y,&img_key1);
break;
case 'a': //block link to the key2 when it's not powered on
dimage(x,y,&img_key2blockvoid);
break;
case '4': //block link to the key2
dimage(x,y,&img_key2block);
break;
@ -69,6 +74,9 @@ void draw_level(char level[])
case 'B': //damaged block
dimage(x,y,&img_damaged);
break;
case 'l': //chock blocks
dimage(x,y,&img_chock);
break;
}
x+=16;
if(x==16*25)

View File

@ -328,6 +328,7 @@ void game(int *id_level, char mode)
//when a level is quit
if(mode)
{
if(*id_level==0) *id_level=1;
if(game_loop)
{
dclear(C_WHITE);

View File

@ -40,7 +40,6 @@ char start_menu()
char speed_menu(int *id_level)
{
char level[351];
char gravity = 0; //0 down 1 up
int start_x;
@ -80,6 +79,12 @@ char speed_menu(int *id_level)
{
draw_time(*id_level);
}
if (keydown(KEY_POWER))
{
*id_level=0;
del_level(level);
return 0;
}
if(keydown_any(KEY_EXIT, KEY_MENU, 0)) return 1;
while (keydown_any(KEY_RIGHT, KEY_LEFT, 0)) clearevents();
}

View File

@ -1,7 +1,12 @@
#include "setlevel.h"
#include <gint/std/string.h>
void set_level(int id_level, char level[], int *startx, int *starty, char *gravity, int *appear, int *disappear){
switch(id_level){case 1:
switch(id_level){case 0:
memcpy(level,"11100111111111111111111111l00000l01BB1BB1BB1BB1BB1100000000000100100100100110000000000000010010010011b0t000000000000001001001111111000000000000000100111111d000000000000000000100000d000000000000000000010000d000000000000000011110000d000030000a0c0m0000110000d000030000a0c0m0000110000d000030000a0c0m0000110s00d00k0300K0a0c0m00e011110011111111111111111111",350);
*appear=7;
*disappear=9;
break;
case 1:
memcpy(level,"10011111111dddd1111111111000111100000000000000000000011110011111111ddd100001111111001dd000ddddd111111111111001dd0t0ddddddddd11000001001dd000ddddddddd11000001001aaaaaaaaaaaaaa110s00010010000000000000e1111100100100000000000aaa11111001001000000000ddddd1111100100100000000011111100010000010000000003000000001000001000K0000030k00010011111111111111111111116",350);
break;
case 2:
@ -25,14 +30,17 @@ break;
case 6:
memcpy(level,"11111111111011111dddd1111100001dd0000dd100000000011s0001dd0d11dd10000000001111001dd0d111dd00111100011dd001dt0d10000001dd100011dd001d11d10000001dd100011dd00dd11110011111dd100011dd00000000001dddddd100011dd1111dbd1111ddd111100011ddddddd0dd1d1ddd100000011ddddddd0000d1ddd1e0000011ddddddd1110d1ddd111cccc11dddddddddd0d1ddd111dddd11111111111101111111111111",350);
*appear=12;
*disappear=7;
*disappear=13;
break;
case 7:
memcpy(level,"111001111111100d0d0011111100000111ddd000d0d0000001100000000000000dtd00000e1111111ddd111111111111111100000000000000000l00d0000111111111dd111110100d000110001100000000010100d0001000011000000000d0d00d00000000l0000000000d0d00d00001111dd111000000d0d00111111000011111ddd00d0d00111111000011111ddd00d0d001111110s0011111ddd00d0d0011111111001111111100d0d00111116",350);
memcpy(level,"111001111111100d0d0011111100000111ddd000d0d0000001100000000000000dtd00000e1111111ddd111111111111111100000000000000000000d0000111111111dd111110100d000110001100000000010100d0001000011000000000d0d00d0000000000000000000d0d00d00001111dd111000000dld00111111000011111ddd00d0d00111111000011111ddd00d0d001111110s0011111ddd00d0d0011111111001111111100d0d00111116",350);
break;
case 8:
memcpy(level,"dddddddddddddddddddddddddBBBBBBBBBBBBBBBBBBBBBBBBB1000010k10011111dt0a000011000010010010000d11a00001100001BB100100000000000013000000000010001110000000300000000001aaaaaa00000001111110000010000000011111100000000001000000001000110000000a001BBBd00a0100013000000000010001000010003300s000000010K0100001e003aaBBBBBBBBBBBBBBBBBBBaaaaddddddddddddddddddddddddd",350);
break;
case 9:
memcpy(level,"00000ddddddd100000000000011111111111111111110011111000000dd1111ddd0K10000b1100111000000100000100000110000100000010000010010011000k111dd101dd00d10000011000110000001000001BBBB011000100011dd1000001dddd01100010ddd1dd1d00dd1011001133310ddd1dd1BBBBB1t00001100000ddd1dd1000001ddd1111s0000ddd1dd10000011111111BBB111aaaaa110001111111100000000000e1000000000000",350);
break;
}
set_gravity(id_level, gravity);
unsigned int x = 0;
@ -48,7 +56,10 @@ x+=16;
if(x==16*25){x=0;
y+=16;}i++;}}
void set_gravity(int id_level, char *default_gravity){
switch(id_level){case 1:
switch(id_level){case 0:
*default_gravity = 0;
break;
case 1:
*default_gravity = 0;
break;
case 2:
@ -72,6 +83,9 @@ break;
case 8:
*default_gravity = 0;
break;
case 9:
*default_gravity = 0;
break;
}}
void del_level(char level[])
{memcpy(level,"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",350);}

View File

@ -46,6 +46,10 @@ void check_medal(unsigned int frame_level, int id_level)
time = 7;
time2 = 62;
break;
case 9:
time = 12;
time2 = 26;
break;
}
if(frame_level/FPS < (unsigned int)time || (frame_level/FPS <= (unsigned int)time && frame_level%FPS <= (unsigned int)time2)) dimage(380,8,&img_createur);
@ -105,6 +109,10 @@ void draw_time(int id_level)
time = 7;
time2 = 62;
break;
case 9:
time = 12;
time2 = 26;
break;
}
dimage(160,90,&img_createur);
dprint(175,90,C_BLACK,"%d.%02d",time,time2);