changement blocs + éditeur

editor/AST3generator.py

@@ -81,16 +81,20 @@ def place():
                 fenetre.blit(pygame.transform.scale(chrono1,(52,52)),(52*b,52*a))
             if grille[a][b]=="3":
                 fenetre.blit(pygame.transform.scale(keyblock,(52,52)),(52*b,52*a))
-            if grille[a][b]=="m":
+            if grille[a][b]=="m" and tab==0:
+                fenetre.blit(pygame.transform.scale(chrono2appear,(52,52)),(52*b,52*a))
+            elif grille[a][b]=="m" and tab:
                 fenetre.blit(pygame.transform.scale(chrono2,(52,52)),(52*b,52*a))
             if grille[a][b]=="K":
                 fenetre.blit(pygame.transform.scale(key2,(52,52)),(52*b,52*a))
-            if grille[a][b]=="a":
+            if grille[a][b]=="a" and tab==0:
+                fenetre.blit(pygame.transform.scale(key2blockvoid,(52,52)),(52*b,52*a))
+            elif grille[a][b]=="a" and tab:
                 fenetre.blit(pygame.transform.scale(key2block,(52,52)),(52*b,52*a))
             if grille[a][b]=="t":
                 fenetre.blit(pygame.transform.scale(coin,(52,52)),(52*b,52*a))
             if grille[a][b]=="l":
-                fenetre.blit(pygame.transform.scale(change,(52,52)),(52*b,52*a))
+                fenetre.blit(pygame.transform.scale(chock,(52,52)),(52*b,52*a))
             if grille[a][b]=="b":
                 fenetre.blit(pygame.transform.scale(blackout,(52,52)),(52*b,52*a))
             if grille[a][b]=="B":
@@ -99,8 +103,10 @@ def place():
                 fenetre.blit(pygame.transform.scale(ice,(52,52)),(52*b,52*a))
             if grille[a][b]=="S":
                 fenetre.blit(pygame.transform.scale(switch,(52,52)),(52*b,52*a))
-            if grille[a][b]=="h":
+            if grille[a][b]=="h" and tab==0:
                 fenetre.blit(pygame.transform.scale(appear,(52,52)),(52*b,52*a))
+            elif grille[a][b]=="h" and tab:
+                fenetre.blit(pygame.transform.scale(appearblock,(52,52)),(52*b,52*a))
     fenetre.blit(level, (10, 10))
     fenetre.blit(levelgr, (10, 60))
     fenetre.blit(timeapp, (55, 10))
@@ -133,24 +139,28 @@ gravityid = 6
 disa = 10
 app = 13
 lock=""
+tab = 0
 
 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()
+key2blockvoid = pygame.image.load("editor/img/key2blockvoid.png").convert_alpha()
 chrono1 = pygame.image.load("editor/img/chrono1.png").convert_alpha()
 chrono2 = pygame.image.load("editor/img/chrono2.png").convert_alpha()
+chrono2appear = pygame.image.load("editor/img/chrono2appear.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_alpha()
 coin = pygame.image.load("editor/img/coin.png").convert_alpha()
-change = pygame.image.load("editor/img/change.png").convert_alpha()
+chock = pygame.image.load("editor/img/chock.png").convert_alpha()
 blackout = pygame.image.load("editor/img/blackout.png").convert_alpha()
 damaged = pygame.image.load("editor/img/damaged.png").convert_alpha()
 switch = pygame.image.load("editor/img/switch.png").convert_alpha()
 ice = pygame.image.load("editor/img/ice.png").convert_alpha()
 appear = pygame.image.load("editor/img/appear.png").convert_alpha()
+appearblock = pygame.image.load("editor/img/appearblock.png").convert_alpha()
 
 load(id_level)
 place()
@@ -200,6 +210,10 @@ while securite==False:
                     gravityid="7"
                 write()
                 place()
+            if event.key == pygame.K_TAB:
+            	if tab==0: tab = 1
+            	else: tab = 0
+            	place()
         elif event.type == pygame.MOUSEBUTTONDOWN:
             if event.button == 1:
                 x=int(event.pos[0]/52)

src/drawlevel.c

@@ -12,15 +12,21 @@ extern bopti_image_t img_dead; //dead block
 extern bopti_image_t img_player; //player
 extern bopti_image_t img_end; //end of level
 extern bopti_image_t img_key1; //key 1
+extern bopti_image_t img_keyblock; //block link to the key1
 extern bopti_image_t img_blackout; //blackout
 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
 extern bopti_image_t img_switch; //switch block
 extern bopti_image_t img_ice; //switch block
 extern bopti_image_t img_appear; //appear block
+extern bopti_image_t img_appearblock; //appear block
+extern bopti_image_t img_chrono2appear; //appear block
+
 
 extern bopti_image_t img_endscreen;
 extern bopti_image_t img_new;
@@ -53,25 +59,25 @@ void draw_level(char level[])
 				dimage(x,y,&img_end);
 				break;
 			case '3': //block link to the key1
-				dsubimage(x,y,&img_key1,0,0,16,16,DIMAGE_NONE);
+				dimage(x,y,&img_keyblock);
 				break;
 			case 'k': //key1
-				dsubimage(x,y,&img_key1,16,0,16,16,DIMAGE_NONE);
+				dimage(x,y,&img_key1);	
 				break;
 			case 'a': //block link to the key2 when it's not powered on
-				dsubimage(x,y,&img_key2,0,0,16,16,DIMAGE_NONE);
+				dimage(x,y,&img_key2blockvoid);
 				break;
 			case '4': //block link to the key2
-				dsubimage(x,y,&img_key2,16,0,16,16,DIMAGE_NONE);
+				dimage(x,y,&img_key2block);
 				break;
 			case 'K': //key2
-				dsubimage(x,y,&img_key2,32,0,16,16,DIMAGE_NONE);
+				dimage(x,y,&img_key2);
 				break;
 			case 'c': //chrono blocks
 				dimage(x,y,&img_chrono1);
 				break;
 			case 'C': //chrono blocks
-				dsubimage(x,y,&img_chrono2,16,0,16,16,DIMAGE_NONE);
+				dimage(x,y,&img_chrono2);
 				break;
 			case 'b': //blackout blocks
 				dimage(x,y,&img_blackout);
@@ -82,23 +88,23 @@ void draw_level(char level[])
 			case 'l': //chock blocks
 				dimage(x,y,&img_chock);
 				break;
-			case 'i': //ice blocks
+			case 'i': //chock blocks
 				dimage(x,y,&img_ice);
 				break;
 			case 'S': //chock blocks
 				dimage(x,y,&img_switch);
 				break;
 			case 'h': //void appear blocks
-				dsubimage(x,y,&img_appear,0,0,16,16,DIMAGE_NONE);
-				break;
-			case 'y': //void appear blocks
-				dsubimage(x,y,&img_appear,0,0,16,16,DIMAGE_NONE);
+				dimage(x,y,&img_appear);
 				break;
 			case 'H': //appear blocks
-				dsubimage(x,y,&img_appear,16,0,16,16,DIMAGE_NONE);
+				dimage(x,y,&img_appearblock);
+				break;
+			case 'y': //appear blocks
+				dimage(x,y,&img_appearblock);
 				break;
 			case 'm': //chronoappear blocks
-				dsubimage(x,y,&img_chrono2,0,0,16,16,DIMAGE_NONE);
+				dimage(x,y,&img_chrono2appear);
 				break;
 		}
 		x+=16;

src/setlevel.c

@@ -34,7 +34,7 @@ memcpy(level,"10001011111011111111111111000101dd10001111dddd11110000101dd1000100
 *disappear=9;
 break;
 case 7:
-memcpy(level,"111001111111100i0d0011111100000111ddd000i0d0000001100000000000000itd00000e1111111ddd111111111111111100000000000000000h00d0000111111111dd111110100d000110001100000000010100d0001000011000000000i0d00d0000000000000000000i0d00d00001111dd111000000ild00111111000011111ddd00i0d0011111d000011111ddd00i0d0011111d0s0011111ddd00i0d0011111111001111111100i0d00111116",350);
+memcpy(level,"111001111111100i0d0011111100000111ddd000i0d0000001100000000000000itd00000e1111111ddd111111111111111100000000000000000h00d0000111111111dd111110100d000110001100000000010100d0001000011000000000i0d00d0000000000000000000i0d00d00001111dd111000000ild00111111000011111ddd00i0d0011111d000011111ddd00i0d0011111d0s0011111ddd00i0d0011111111001111111100i0d0011111",350);
 break;
 case 8:
 memcpy(level,"dddddddddddddddddddddddddBBBBBBBBBBBBBBBBBBBBBBBBB100001kk10011111dt0a000011000010010010000d11a00001100001BB100100000000000013000000000010001110000000300000000001aaaaaa0000000111111000001000000001111110dd00000001000000001000110000000a001BBBd00a0100013000000000010001000010003300s000000010K0100001e003aaBBBBBBBBBBBBBBBBBBBaaaaddddddddddddddddddddddddd",350);

times.lvl

@@ -1,15 +1,15 @@
-5.85-Tituya
-8.67-Tituya
-5.64-Massena
-3.50-Tituya
-3.54-Tituya
-8.42-Tituya
-6.67-Tituya
-7.60-Tituya
+5.80-KikooDX
+8.62-KikooDX
+5.14-KikooDX
+3.22-KikooDX
+3.25-KikooDX
+8.20-KikooDX
+6.60-KikooDX
+7.18-KikooDX
 9.20-Massena
-5.77-Tituya
+5.22-Massena
 6.04-Tituya
 10.38-Tituya
 5.34-Tituya
-7.67-Tituya
-6.24-Tituya
+7.61-Tituya
+6.05-Tituya