From e43151aa29495cb779ca3395ee18ffb8d9cbaf7c Mon Sep 17 00:00:00 2001 From: Tituya Date: Fri, 14 Aug 2020 01:21:32 +0200 Subject: [PATCH] modifs textures, nouveau+modifs niveaux + niveau de test --- AST3.g3a | Bin 159028 -> 160892 bytes assets-cg/img/chock.png | Bin 0 -> 258 bytes assets-cg/img/key2block.png | Bin 599 -> 582 bytes assets-cg/img/key2blockvoid.png | Bin 0 -> 259 bytes compile_level.py | 4 ++-- editor/AST3generator.py | 27 ++++++++++++++------------- editor/img/change.png | Bin 265 -> 258 bytes editor/img/key2block.png | Bin 631 -> 259 bytes editor/img/key2block4.png | Bin 0 -> 631 bytes editor/levels/0.lvl | 4 ++++ editor/levels/6.lvl | 2 +- editor/levels/7.lvl | 2 +- editor/levels/9.lvl | 1 + src/drawlevel.c | 8 ++++++++ src/main.c | 1 + src/menu.c | 7 ++++++- src/setlevel.c | 22 ++++++++++++++++++---- src/times.c | 8 ++++++++ 18 files changed, 64 insertions(+), 22 deletions(-) create mode 100644 assets-cg/img/chock.png create mode 100644 assets-cg/img/key2blockvoid.png create mode 100644 editor/img/key2block4.png create mode 100644 editor/levels/0.lvl create mode 100644 editor/levels/9.lvl diff --git a/AST3.g3a b/AST3.g3a index dbae8c1b4a660a837b91a52056575149ef0bdd62..b3359b343353a1dc4621c8c3d8617b003bcdd437 100644 GIT binary patch delta 5671 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 E02%>fDgXcg literal 0 HcmV?d00001 diff --git a/assets-cg/img/key2block.png b/assets-cg/img/key2block.png index 29d08490b6df2236e691f7c49e7deeb2fc1eb617..f0b02fdb6e6f9b88342ff3c24ba85fd0e4d1c941 100644 GIT binary patch delta 542 zcmV+(0^$AF1jYoAGk*d7NklPrG5QV?4?jCyv+Zlru;)Dep0EvB$#38r? zhhWDE*ph9;h9dw93bB!%^PtYVG{&8XvTVw9+Mu{x$T74&+@-EW^@2ufUXse>&Utlx>hJW z%-nE;U^uAS$7*?wQ_T(65l(kZKktRt^UQD?b8%${RlnE6WM>ncRFRi9H`iljQS#5` z&Ca3aM7cA-5?r#1=^=Ocv~SwSrWa-|9~HpZ zoEL!ON_Z~Aj(h8z5za<%wln>@$vD!Ul8|jQ*5U1zRC=0z&z^DJ3b%21k%iA#T8QKi z_hP)|PCeU32_kqmD5)R4hsSYwHV;aMT!AtNA zJOwQ^PeM;iDnvv_i6|hPl;oU?FY(&DYl`*x2nExuH2ckb-~7w=KYr=~mh%??Fz3Ja zHm3Le*HZwpH}5_#3*&GByoavykY(h#MrV-_71wo3k0Mu~1b;$+yFT*a^~+Lz*H`6Y z*^uW@7{O}Tod})ZvgSKb7Mj+>#f`%nVb5rogAxtTPbQokTC9eqO+ljcJ?WJTeEYRV z8R53^EUsO`%?gdr5@=EgyA!Bt4|on|1pqz<+79M3ivZdP#gJHR4%fE*ufq&Ud({uqfDBM3gMJg9)dcecFi$J95!YJLxFqX5r4LmtW$(uG|1fXd= z&cUMtp{hMq9kEuJnr$EAQ0Do{jlSjl6)FaB4le3;Wcqp8j-a{?)NQ~DSV_LcrDt*J z2L(MGm%`Cr`Yoq2Hm@FJZUUQOw8wkG9l#t!2@ukP_>JP~Xk(3ssnMff5A6|vqum161^Ufw|5~D>Y0CKh%5kxBlvBZEDRTep6v>n( zH-OSKKHOukYCrY?zz*^rn6%aa@^G3_yB_BPZ3L5VWtRi{zxL(Fnw?w#i*#+t%r-bl x*VqnMWGIZFvqkxy0%l%_A4jWI&7BzDuJ=A=|s{NIrj*EL^piSe{2ZAaQ9iI6QbyZw8c$;J^ zhAD|tOX3*zadc|whu;7D;?I}U$v(H%aH`D>$@Ja!>+h##q0r;s zm~JqwN=gpkR4(=5F$nY6%dmWhv`~#Qv(R5g=8Yi_^vf>Heec6_$42{d{1L17te55; zoAuP3A*^{=El6trG$)U9kUw7y+@Hc+-{MPdR(s7_K7(8A5T-G@y GGywqXab&;% literal 0 HcmV?d00001 diff --git a/compile_level.py b/compile_level.py index 3b31c1c..ab04313 100644 --- a/compile_level.py +++ b/compile_level.py @@ -1,4 +1,4 @@ -ids = 1 +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, \ @@ -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: diff --git a/editor/AST3generator.py b/editor/AST3generator.py index 05c4c9a..1d0389b 100644 --- a/editor/AST3generator.py +++ b/editor/AST3generator.py @@ -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": diff --git a/editor/img/change.png b/editor/img/change.png index a5c5221b079d15ca36457c75e4eb855608f70ace..f6e3d0f8b4c0895e140eeb762d55c289c6f3becf 100644 GIT binary patch delta 214 zcmV;{04e{80)hgNG=I5CL_t(Ijm45n4uU`sL?6VR!2@^$J&Im{BXR*b3J_MTaN))f zw@kS}#xO8UG%;4v$^5Fix_cu0NId5P9^)oj5zxw=<;6a-+7wmT=nE)wjQh|PSaf6z z)D7lvA`ZB=*`*4pLVbaX3&K;9uLO(h4UXrxxGUt^k=hixY)`JVO9#R}oA5SES-aPe zq6m`hur~LMy1|58%Z;%QWlrzf4?$|vAUW8?PsTUP{*CR4z+cF)@L7I}C#HC3SEwG@ QZ~y=R07*qoM6N<$f`LwCf&c&j delta 221 zcmV<303!c_0*L~UG=IQJL_t(Ijg3>m5yK!1lUacY@?pAOR-j#>N0;lT6J!SUQ6L6P zs6GM5mSr0QByk0jrcbuHdPx(a7XT4yY|7U`M5;qrsL{basYwvXYAfeXshg6N?^^^u zp63puj584M@w6Y0)|aGR1_1a-C7)G6Pe5{H$j;jVeA4}AdsZ4rnsQ1u)wB(-t#`@Niz=N^h0E57WR1)?_P%e6H_nV2oz1=H zaK8Tk^S8=hz8Zjf^)did`LETo{C&Q;4uEyz@sinT1OTkvn|}o0)`w-9t%QZy2>_<& zRZZpJl z1mkF^f{2C-XZkouQ<|-WAcBS2ao93^d$x%03RATuUOXCQ`2I%*D;@_yLj6wyfD~O# zV&%B{T%phH;(v`}pzTl9mLLHEv?GUMlxIU6rT}<0_ywJlH3(S-%~pc%=CNW?qXcXR z3ZACCv5xG8DS-hJXvG#zD&2NTu)6MSDM0q2>`+wUj!;C)s)QKw$4D}1=Py0s; zdj+-KBQ#*BB$P^$pHT^rf|6rXE5{&g8S0nvCPqLqaFyJg3bwF$t%Sr;KSeJf6i5=d^JEPG#}TxZkr~BaGs2*-6=;DZ dgDB1k`3u^#$)9L$E;IlD002ovPDHLkV1f=$5xM{X diff --git a/editor/img/key2block4.png b/editor/img/key2block4.png new file mode 100644 index 0000000000000000000000000000000000000000..d38d315a5fa7d0da395f51bdbd837f35ea92fd52 GIT binary patch literal 631 zcmV--0*L*IP)-t#`@Niz=N^h0E57WR1)?_P%e6H_nV2oz1=HaK8Tk^S8=h zz8Zjf^)did`LETo{C&Q;4uEyz@sinT1OTkvn*`w2hh>_rgoW7&0H)_wuq=zp?GXUJ zzg)&v@Op9#i8F{}ux%K7vxui5^Mr-j32HwL05by?({n5Qc(uxIGsJTQ<7lXYh=vPi z`Z!2anyrK&f`!>}*fM;3wutWvQ?(^tJQ`*A{znEY9tS}}{Z9gb6kSbX<+%D>q0jB& zjbotgPt}$n0RgllhhdawLmZ|6csBS2os%^PSq9Bkg74=gdyziM{Lethb`01?$JbfBftCGE5nRF{M3mn3=H)P=TG}b3ws5%-6J$$s3eq1 zlAlotkb;t9Q!B?HY#Hj8@+L+=N9_%)6dFOoUYn?n{W3@Y)vkAGDPachXU0!V?6r$` z-%;>g3bwF$t%Sr;KSeJf6i5=d^JEPG#}TxZkr~BaGs2*-6=;DZgDB1k`3u^#$)9L$ RE;IlD002ovPDHLkV1g~B6_x-1 literal 0 HcmV?d00001 diff --git a/editor/levels/0.lvl b/editor/levels/0.lvl new file mode 100644 index 0000000..fe2c5a3 --- /dev/null +++ b/editor/levels/0.lvl @@ -0,0 +1,4 @@ +11100111111111111111111111l00000l01BB1BB1BB1BB1BB1100000000000100100100100110000000000000010010010011b0t000000000000001001001111111000000000000000100111111d000000000000000000100000d000000000000000000010000d000000000000000011110000d000030000a0c0m0000110000d000030000a0c0m0000110000d000030000a0c0m0000110s00d00k0300K0a0c0m00e0111100111111111111111111116 + +7 +9 \ No newline at end of file diff --git a/editor/levels/6.lvl b/editor/levels/6.lvl index b3d3ae7..80fac87 100644 --- a/editor/levels/6.lvl +++ b/editor/levels/6.lvl @@ -1,4 +1,4 @@ 11111111111011111dddd1111100001dd0000dd100000000011s0001dd0d11dd10000000001111001dd0d111dd00111100011dd001dt0d10000001dd100011dd001d11d10000001dd100011dd00dd11110011111dd100011dd00000000001dddddd100011dd1111dbd1111ddd111100011ddddddd0dd1d1ddd100000011ddddddd0000d1ddd1e0000011ddddddd1110d1ddd111cccc11dddddddddd0d1ddd111dddd111111111111011111111111116 12 -7 \ No newline at end of file +13 \ No newline at end of file diff --git a/editor/levels/7.lvl b/editor/levels/7.lvl index 38c3221..b72939a 100644 --- a/editor/levels/7.lvl +++ b/editor/levels/7.lvl @@ -1 +1 @@ -111001111111100d0d0011111100000111ddd000d0d0000001100000000000000dtd00000e1111111ddd111111111111111100000000000000000l00d0000111111111dd111110100d000110001100000000010100d0001000011000000000d0d00d00000000l0000000000d0d00d00001111dd111000000d0d00111111000011111ddd00d0d00111111000011111ddd00d0d001111110s0011111ddd00d0d0011111111001111111100d0d00111116 +111001111111100d0d0011111100000111ddd000d0d0000001100000000000000dtd00000e1111111ddd111111111111111100000000000000000000d0000111111111dd111110100d000110001100000000010100d0001000011000000000d0d00d0000000000000000000d0d00d00001111dd111000000dld00111111000011111ddd00d0d00111111000011111ddd00d0d001111110s0011111ddd00d0d0011111111001111111100d0d00111116 diff --git a/editor/levels/9.lvl b/editor/levels/9.lvl new file mode 100644 index 0000000..dabd977 --- /dev/null +++ b/editor/levels/9.lvl @@ -0,0 +1 @@ +00000ddddddd100000000000011111111111111111110011111000000dd1111ddd0K10000b1100111000000100000100000110000100000010000010010011000k111dd101dd00d10000011000110000001000001BBBB011000100011dd1000001dddd01100010ddd1dd1d00dd1011001133310ddd1dd1BBBBB1t00001100000ddd1dd1000001ddd1111s0000ddd1dd10000011111111BBB111aaaaa110001111111100000000000e10000000000006 \ No newline at end of file diff --git a/src/drawlevel.c b/src/drawlevel.c index e70916a..f33f678 100644 --- a/src/drawlevel.c +++ b/src/drawlevel.c @@ -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) diff --git a/src/main.c b/src/main.c index 046e38e..57b3cef 100644 --- a/src/main.c +++ b/src/main.c @@ -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); diff --git a/src/menu.c b/src/menu.c index 8a7e7e6..1b15a84 100644 --- a/src/menu.c +++ b/src/menu.c @@ -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(); } diff --git a/src/setlevel.c b/src/setlevel.c index d958d19..489a247 100644 --- a/src/setlevel.c +++ b/src/setlevel.c @@ -1,7 +1,12 @@ #include "setlevel.h" #include 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);} \ No newline at end of file diff --git a/src/times.c b/src/times.c index 3abde5e..a7181e2 100644 --- a/src/times.c +++ b/src/times.c @@ -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);