From 3cf39462de5223e5255927615eb97e22b0a13c75 Mon Sep 17 00:00:00 2001 From: Tituya Date: Sat, 14 Nov 2020 17:59:59 +0100 Subject: [PATCH] Patch editeur en python3 --- AST3.g3a | Bin 195000 -> 178164 bytes build.sh | 4 ++-- editor.sh | 2 +- editor/AST3generator.py | 32 ++++++++++++++++++++++++-------- editor/README.md | 3 ++- editor/img/appearblock.png | Bin 0 -> 636 bytes editor/img/chock.png | Bin 0 -> 258 bytes editor/img/chrono2appear.png | Bin 0 -> 348 bytes editor/img/key2block.png | Bin 259 -> 582 bytes editor/img/key2blockvoid.png | Bin 0 -> 259 bytes editor/levels/15.lvl | 2 +- editor/levels/2.lvl | 2 +- src/setlevel.c | 4 ++-- 13 files changed, 33 insertions(+), 16 deletions(-) create mode 100644 editor/img/appearblock.png create mode 100644 editor/img/chock.png create mode 100644 editor/img/chrono2appear.png create mode 100644 editor/img/key2blockvoid.png diff --git a/AST3.g3a b/AST3.g3a index dc0b8f08e4f31acb6f9fc629787f947a77c782b6..2ebf772cac714c59b60101252636f173479339bf 100644 GIT binary patch delta 8316 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 Zhw0Zw5Q&Yj?Zd+z{2vW)2mX(&{|jutw;})l diff --git a/build.sh b/build.sh index 3a130f2..5f624a8 100755 --- a/build.sh +++ b/build.sh @@ -1,11 +1,11 @@ #!/usr/bin/bash echo "making setlevel.c from editor" rm src/setlevel.c -python compile_level.py +python3 compile_level.py echo "done" echo "making times.c from times.lvl" rm src/times.c -python time.py +python3 time.py echo "done" echo "building for cg" fxsdk build-cg diff --git a/editor.sh b/editor.sh index 3463d43..65fa523 100755 --- a/editor.sh +++ b/editor.sh @@ -1,3 +1,3 @@ #!/usr/bin/bash echo "opening editor" -python editor/AST3generator.py +python3 editor/AST3generator.py diff --git a/editor/AST3generator.py b/editor/AST3generator.py index 705e973..8a8e0af 100644 --- a/editor/AST3generator.py +++ b/editor/AST3generator.py @@ -2,7 +2,7 @@ Programme de création de niveau pour A Switch to the top fait par Tituya Pour le CPC#26 """ - +# coding: utf-8 import pygame from pygame.locals import * @@ -68,9 +68,9 @@ def place(): if grille[a][b]=="1": fenetre.blit(pygame.transform.scale(solid_0,(52,52)),(52*b,52*a)) if grille[a][b]=="s" and int(gravityid)==6: - fenetre.blit(pygame.transform.scale(player,(39,39)),(52*b,52*a+13)) + fenetre.blit(pygame.transform.scale(player.subsurface((0,0),(12,12)),(39,39)),(52*b,52*a+13)) elif grille[a][b]=="s" and int(gravityid)==7: - fenetre.blit(pygame.transform.scale(player,(39,39)),(52*b,52*a)) + fenetre.blit(pygame.transform.scale(player.subsurface((0,0),(12,12)),(39,39)),(52*b,52*a)) if grille[a][b]=="e": fenetre.blit(pygame.transform.scale(end,(52,52)),(52*b,52*a)) if grille[a][b]=="d": @@ -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,12 @@ 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]=="p": + fenetre.blit(pygame.transform.scale(power,(52,52)),(52*b,52*a)) + 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 +141,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 +212,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) diff --git a/editor/README.md b/editor/README.md index 85201c4..3c6d465 100644 --- a/editor/README.md +++ b/editor/README.md @@ -2,7 +2,7 @@ ## Éditeur : -Pour ouvrir (python + pygame): +Pour ouvrir (python3 + pygame): `$ ./editor.sh` ## Commande : @@ -14,6 +14,7 @@ Pour ouvrir (python + pygame): - R augmenter temps avant disparition blocs - (temps affiché en haut à gauche) - F baisser temps avant disparition blocs - - SHIFT changer le sens de la gravité par défaut (gravité affichée en haut à gauche) +- TAB Afficher le design des blocs non activé - A supprime le bloc bloqué dans la main. - N pour reset la pièce en entier diff --git a/editor/img/appearblock.png b/editor/img/appearblock.png new file mode 100644 index 0000000000000000000000000000000000000000..4c8dffe29bd3c31401f6e3bb828762e7f20f689d GIT binary patch literal 636 zcmV-?0)zdDP)fBpKB1du>L%O&Dg7X#OlalmeItIHt2Om`FY1y*T93zRTo zoYWZ8Iqidj5q;1MieQ>V|K5i3^w@^^(V4nLMcCGu$AwU)crkD@co+1|Y5ygDC(3qV zZRW831?&N|N$Ori24+cQ5DAfR{A@h`4pWHvnAFEba`88CIxTv;jkpXm`OTQK(tmH5 zAR2VD*!%!70!@_NZNStuI2kR1X{Z!n_*97q_J50^>v4BthSM&I^RiIug$I=5lTlwq zB=BmqY@Cjb$iU6H&J)9`hcxso?te_&z~&@hMKOU_=+DOa-Awxic@?n|-94B@WMi6z zOU!@XPHV8+f^~@T3fCv6Tdgn|`MAR5n4Eerri0K}(K?BQ@~fp!)>p1FQvQBIyOMB+-C#N6kuqFS<955UnL9@J(U{*MQ9^ z%)ssn%m?tjkf3b9*HCNH8bmBh^NScdQM6dw%FW7Vu>ByWQ*xLg6Z+L^K{VJtBrbUQ z1M(}Bx6rNQ_7hIQM2rp6vAUqOmP^C4*dG_&F7SRC>i3}PkWlht!@fAHYcf=EDTxeB zU~d<6yM3f}V93KG?AtT7#AyGjb?@eJ z*bANC*>HSEXBf+tqV&p*{cH4`Ma_OOosxNMSHdbLE6H5iY&oZcd0lSVN~cu;@e3X` zeVFn@`{1Knhd%xhD{qal4w~*b``pxTHyv&)6~33I`TDQv5{;%5>osR}m*yELUN1_1 z<2>{7?r+W$cIkNVnSGr6@$9Dhzopr E02%>fDgXcg literal 0 HcmV?d00001 diff --git a/editor/img/chrono2appear.png b/editor/img/chrono2appear.png new file mode 100644 index 0000000000000000000000000000000000000000..44479f5c43173e89529178f04d0ee35b05c33581 GIT binary patch literal 348 zcmV-i0i*tjP)s`&`g66m7c$4Mh#H}!*T8Zt zq(g|FPbEDh@#34uKb-3QVItTG<%3Up3M$YE23$R1W}|v1#KY&sue@XCgzQde$&zPt uwi5d4lCOrXy02RUTf=U>ue~+Q3H<%W8Gk*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)R4hsSYwkxy0%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/editor/levels/15.lvl b/editor/levels/15.lvl index 38482e6..2113bcf 100644 --- a/editor/levels/15.lvl +++ b/editor/levels/15.lvl @@ -1,4 +1,4 @@ i011100dd1111dddm111ddmd1i01d1000000010S0011100S01i01d100000001000000000001i01d1cc111001hh1c11111001i01ddddddi00i000bddd00001i01dd1133i00i000lddd000K1100000000i00i00001d110011300000000i00100331d100003300000010i001s03t1d1000031111100hki0011111ddd1BB1110S01hh11100m0000aaa0000110001001d100m000000000001100e1001d100m0aaa000aaa0110d11001111111ddddddddd116 -5 +4 7 \ No newline at end of file diff --git a/editor/levels/2.lvl b/editor/levels/2.lvl index 04771e4..b4e7501 100644 --- a/editor/levels/2.lvl +++ b/editor/levels/2.lvl @@ -1,3 +1,3 @@ -1dddddd100111111111111111000000000011111000000000000000000l01100c00000000001aaaaaaa111100c00000000011dddddddddd1001aaaaaaaaa11cccccccccc1001ddddddddd10000000000d1331000000aa000000000000s10e1k0000000001ccccccccc111111111113311100000000011001000000000110000000001100b0000000001100000000011t0b00000000011000K0000011111aaaaaaaaa1111111110011111ddddddddd16 +1dddddd100111111111111111000000000011111000000000000000000l01100c00000000001aaaaaaa111100c00000000011dddddddddd1001aaaaaaaaa11cccccccccc1001ddddddddd1000000000001331000000aa000000000000s10e1k0000000001ccccccccc111111111113311100000000011001000000000110000000001100b0000000001100000000011t0b00000000011000K0000011111aaaaaaaaa1111111110011111ddddddddd16 12 1 \ No newline at end of file diff --git a/src/setlevel.c b/src/setlevel.c index d79e508..feea25b 100644 --- a/src/setlevel.c +++ b/src/setlevel.c @@ -10,7 +10,7 @@ case 1: memcpy(level,"10011111111dddd1111111111000111100000000000000000000011110011111111ddd100001111111001dd000ddddd111111111111001dd0t0ddddddddd11000001001dd000ddddddddd11000001001aaaaaaaaaaaaaa110s00010010000000000000e11d1100100100000000000aaa11111001001000000000ddddd1111100100100000000011111100010000010000000003000000001000001000K0000030k0001001111111111111111111111",350); break; case 2: -memcpy(level,"1dddddd100111111111111111000000000011111000000000000000000l01100c00000000001aaaaaaa111100c00000000011dddddddddd1001aaaaaaaaa11cccccccccc1001ddddddddd10000000000d1331000000aa000000000000s10e1k0000000001ccccccccc111111111113311100000000011001000000000110000000001100b0000000001100000000011t0b00000000011000K0000011111aaaaaaaaa1111111110011111ddddddddd1",350); +memcpy(level,"1dddddd100111111111111111000000000011111000000000000000000l01100c00000000001aaaaaaa111100c00000000011dddddddddd1001aaaaaaaaa11cccccccccc1001ddddddddd1000000000001331000000aa000000000000s10e1k0000000001ccccccccc111111111113311100000000011001000000000110000000001100b0000000001100000000011t0b00000000011000K0000011111aaaaaaaaa1111111110011111ddddddddd1",350); *appear=12; *disappear=1; break; @@ -58,7 +58,7 @@ memcpy(level,"1111111111111ddd11iK1d00100000d111000000011it1d00000000d1000000000 break; case 15: memcpy(level,"i011100dd1111dddm111ddmd1i01d1000000010S0011100S01i01d100000001000000000001i01d1cc111001hh1c11111001i01ddddddi00i000bddd00001i01dd1133i00i000lddd000K1100000000i00i00001d110011300000000i00100331d100003300000010i001s03t1d1000031111100hki0011111ddd1BB1110S01hh11100m0000aaa0000110001001d100m000000000001100e1001d100m0aaa000aaa0110d11001111111ddddddddd11",350); -*appear=5; +*appear=4; *disappear=7; break; }