From 1b02d355e5fc82a0457be877d0cc1262d9ca3502 Mon Sep 17 00:00:00 2001 From: KikooDX Date: Tue, 25 Feb 2020 11:06:54 +0100 Subject: [PATCH] Integrated the UP-editor system. --- editor.sh | 3 + levels.lua | 159 ++++++++------------------------------------------- platform.g3a | Bin 68428 -> 66908 bytes 3 files changed, 26 insertions(+), 136 deletions(-) create mode 100755 editor.sh diff --git a/editor.sh b/editor.sh new file mode 100755 index 0000000..39edbd2 --- /dev/null +++ b/editor.sh @@ -0,0 +1,3 @@ +cd ../up-editor/ +love . +cd ../platformer diff --git a/levels.lua b/levels.lua index 052e6c6..24eb741 100644 --- a/levels.lua +++ b/levels.lua @@ -1,143 +1,30 @@ --- . air --- 0 solid --- - placeholder tile --- v spike --- ^ elevator --- ~ ice --- # glue --- j jump upgrade --- c coin --- --- level id format : YYXX with YY and XX being the Y and X position on the map - -levels = {[5050] = [[ ----------------------------- --0000000....000000000000000- --0000000....000000000000000- --00000000....00000.........- --00000000..................- --00000000...........0000000- --0000000000.....00000000000- --0000000000.....00000000000- --00000000...........0000000- --00000..............0000000- --.............0000000000000- --..........0000000000000000- --00000000000000000000000000- --00000000000000000000000000- --00000000000000000000000000- --00000000000000000000000000- ----------------------------- -]], -[5049] = [[ ----------------------------- --00000000000000000000000000- --00000000000000000000000000- --00......................00- --00......................00- --00......................00- --00......................00- --00......................00- --........................00- --........................00- --00........................- --000.......................- --000.0000000000000000000000- --..........0000000000000000- --00000000..0000000000000000- --00000000..0000000000000000- ----------------------------- -]], -[5048] = [[ ----------------------------- --00000000000000000000000000- --00000000000000000000000000- --00......................00- --00......................00- --00......................00- --00......................00- --00......................00- --00........................- --00........................- --00.................0000000- --00.................0000000- --00.................0000000- --00.................00..c..- --000000000000000000000.0000- --000000000000000000000.0000- ----------------------------- -]], -[5148] = [[ ----------------------------- --000000000000000000000.0000- --000000000000000000000.....- --00..................000000- --00......................00- --00......................00- --00......................00- --00......................00- --00......................00- --00......................00- --00......................00- --00......................00- --00......................00- --00......................00- --00000000000000000000000000- --00000000000000000000000000- ----------------------------- -]], -[5149] = [[ ----------------------------- --00000000..0000000000000000- --...00000..0000000000000000- --00......................00- --00......................00- --0000000000000000..vv000000- --0000000000000000...0000000- --00000......0000.......0000- --000.........00....00...000- --00^.........00.........000- --00^.j................00000- --00^....................000- --00^.........0^.........000- --0000^.......0^.......00000- --00000000000000000000000000- --00000000000000000000000000- ----------------------------- -]], -[0] = [[ ----------------------------- --00000000000000000000000000- --00000000000000000000000000- --00......................00- --00......................00- --00......................00- --00......................00- --00......................00- --00......................00- --00......................00- --00......................00- --00......................00- --00......................00- --00......................00- --00000000000000000000000000- --00000000000000000000000000- ----------------------------- -]], -} - to_write = "" ---remove all "\n" from level strings current = 0 -for i, v in pairs(levels) do - v = string.gsub(v, "\n", "") - to_write = to_write.." case "..i..":\n memcpy(level, \""..v.."\", "..#v..");\n" - if string.find(v, 'c') then - to_write = to_write.." *coin_id = "..current..";\n" +for i = 0, 9999, 1 do + file = io.open("../up-editor/screens/"..i..".scr") + if file then + file_content = file:read() + formated_file = "" + for j = 1, #file_content, 1 do + if j == 1 then + formated_file = formated_file.."-----------------------------" + end + formated_file = formated_file..file_content:sub(j, j) + if j % 26 == 0 then formated_file = formated_file.."--" end + if j == 390 then + formated_file = formated_file.."---------------------------" + end + end + file:close() + to_write = to_write.." case "..i..":\n memcpy(level, \"".. + formated_file.."\", "..#formated_file..");\n" + if string.find(file_content, 'c') then + to_write = to_write.." *coin_id = "..current..";\n" + end + to_write = to_write.." break;\n" + current = current + 1 end - to_write = to_write.." break;\n" - current = current + 1 end --finish and write diff --git a/platform.g3a b/platform.g3a index 22902640af2361c0cca3001613b2a3b60681d08e..38ddbf07e1d283f9b9558b784ba63bc137474b6f 100644 GIT binary patch delta 2353 zcmaJ@e@xV67=PaT0e6B3avX;+IR)L>B|NmFNLhCVQ!GRb6P7Gbqoiboh)G4`N~+Vl z+tEE2kYQO-D`jE(lF>#AMrDmZU}>|BCK;@jwJ2>_bK3LXmmjWNFMIBJ-skx|&-1>| z^L*bi)T$fZue;@N*T>y0-UETJu3hE7ZT$21n-}1^wdb=&A!he4RnU8JW=a)FTA{Ce z(LElOo0XG;4rPPbF_+vTTIq{>a$8fl!4SWwl->FPseQs4319^bS4=>y8V$n@6Jk~d z5T%BA32bWvpmsnOF)<97YyzA=3RvO+T<-vk%2X-Fpz_4Ztz|pstumhfZIv-MBOrE) z@92Y_2cz=YCs3?Z)cG_blg8_Ji58_|_Zp1=I<#lAk)t%#16l@2*YN#Z-dP3#pQ-|U zwv#S3l(9?E6BlxIfQCz|t>S0Eot(e&3SfPqyTtoQP&eTk(R{64Wgov6V!){49=@5X zpLDKcq@^Zg*;1pC}{EIVmd?eU$grfGOjE3&*%3jm|G# zmg@juI@{OexpWd&&BI4&4>48r&%5y4!rl#h)2K#? z@3%?cA{#Y&QkSu`8fT*y+MHvN$fso%C#Q5p&;`xZ@3|URaN7BeJcm38CmVXET<9IL zi)7ndz9`I|6`TeAW&pog%dywF{ANA#i>E9cpZPEeiO#s)f0s4OA z;o@uT=VSUzOk64-m%tw@OU^u=$-=~?^Jg;UF)_wp%CwQGl1bt^n1-%`$IARH4+|#` zaEyS1b#CS^wXFLG0nNTfPQpojM@K|AaHqK2zCm)o5ENl$@`VLL<2XyP`|K&Y(u*V7 zQ^E%$npNCkiAx<~(oyNYWKm1i`_82_k7$2@VeJI83YWcVK8&dsTG~wR{paHxlYqIL zJGYkU5S98q7bdd!?ZTuK`n5uIQc=J;w^*Hp)XQ=flyHEAC?#7kgMW*I+l`R@_;<0{ z4~+qNf+iXcrVCIegPS#rJbtsOimUBr&X+8)GWYX-j4NNnd!U-oulg>){LAE~ANa&Y z;a!}wFT6(2gr5B6&|4WPw)KmLbxl{Y>s&G0FE;7cFI8UwhfQ(4b(@y)4eu=0 z+}cYW?`(@aN1v%XYovjcraf^o@=GXL}@Kyq~fL(&^)qX*BoKF8by373Pc^ zE=m~4XIL#$9z!3e6DJ>K*-8@w^Qh&s7%DiGz&xI-mN-+rb0?yws(C}M9QpFx9Zj3Y z0k_5idO862Yy^BT4e-88fKOBcZqWfg-vjtG57YxDz`A_EjiZ3xKEP%k#@)qT^SGB7 z;O;X`FI>jcVxQg5=vjx^)03rY?ULbg9>pA-#sS_`ACaYgda>N*m?Kt-nzq_G;u|gh G7xWL~y`s8FN%&5Hkm6;JI~R~cJAUn<0#Q6@}a zMitW+H9H=J@yx6jva-cec03XtEL`l5I#XHK;nYSa+sVxj{Gw;tEC(##M6Nn2Z5J-06Z*JA^kpuuf6tK*{Riex-b5b zr^`ucV5iu9{Pn5JVY{{f$6T?Zre0vx_`r3VO^OviED%@`UU}=Ft{V71n~)+A?w}{L!NvJ8SddB$2tmB!unZF_C^){m;nN;YPh8`e8t&-zBgs+##M^ZBG2Mw-;*xbqPu zX`pvL^`+1`TGG}(ZQU@w`icO$*7)(L;Odezo5lIG)i55}^Ne)S;}JcxpbP3+_2YUQ zWxcQJ`D^-`R`s~H=OO6U{?3rdsM7cfDzn53JcdSCdIES^5%B$6fR{&zvuEa6af%lB z##-Qd8}JmTbw(O@crWl(PIBhJlL#Aj*7}Ew($hg_@-Oh%)Dmv@81R=T=uENmDMn$f zXnW_6f>6LQ!kwU-@TW_t!dm3+gw5plvU@pBeyw#%vgXq$3p`c|Zj;fw$I#`TkIGNA zelBH{Qc_s=yX8znqbv^MnsSw5d(Nn`mauY9ea8nNl>*N%sfbN1=T* zDqjSVfrvKIM;M=tD4&Sh^Bp4c67|o6+f4i}5tZYk7??^r2XU^9wW$xdsrdvYa1&h_ zWj#QPL#xx=hlX>FY)b4p7te&8RP=i+S$6xAQPo{m52He!MZqP;0Z*`xs=oJXP?ev) zY42xpmr4_<{g`PrZ!rlFO|6PQx0X+bnx_#!HYD$k*gbNoazsILD#bKpq5 zg*n7$^(w|@aL#Lu>{PZRky=b~iiHixSSL&H1fO=+rI3N+oocRm*TTf!Nuz~LX? z5z?aZgVuk>r$tkcAkkPKT{(edAn@EOY-&4BZ}ME*cUYK}E@M}rn13;e#asoRUO|m! z6Kw~+xd~kzkCwFCC5xmLt1n$*Mgnh63^^>D%$JLW4U&G%Vz4C}@OD~`_Bb?Oj>U7A z(#1dh#2yNxOA~~$ANYq{}VC*W|e>SAsr@Wa|W@1+vjkdZgCD{e^ zr7hVQ)YQ#wtvp&buD0oqJ*iVm9|&nfvR&BMm9pMN2sI&Up0`Sa5@))$sVH3fwT;3y zEf!s?l)r=Rx!8B@E8T>$i!Z6M@0Z8e1SVcTNx!|cOcXC^ z2DrIOv9+I2_>PCPb~cioUQ=u}@Es9EF2#oX6u!O?`1)LmZA{{AbBb=0R^|X&@}t*i z6ZMtWhkU?-I|Dz!hCt%~q@NGIjo%txi}(Dx5MO1;q=!q7B*;%j1}6KB=niObVPF+* z_UkcXSRW~a7IEkpjMd0!l8lQO6`65o2e6SU`+6W8TLz3WFC8{T^8e`P&we>+h&}Qj*btiSiV?^T@|jW}3A}>) z1JUZt%s1b}n8CQCG@KANBO?To<|T=txk;jI3!NpS0#R_1?eKFp`55v$ocTs3-XAh( zWFY=(z?3b=Tj8@p4CPvixFp~wgNMb*;XB{1J2VFTDDC1$Uf}Q0ULL1?c02%HR|LFj z7Pz+y`1^-|e_su}b_?+DjsX9-8~BAz;BV)4ucoc$=#VM2;Plm__r}t{cwFL=j&EIj p#}u_iVm#vn@T{}Tz;F6xS<){)B)8?O*-m!5&8=pitLQ(`e*@dXKr;XU