From 5091fe267b01b57f4cf7b5911efba6dadf84155c Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Thu, 2 Feb 2023 18:54:40 +0100
Subject: [PATCH] - Implementat el segon layer - Implementat resizar el mapa

---
 data/editor.lua |  69 +++++++++++++++++++++++++++++++++++++++++++++---
 data/game.lua   |  11 ++++++--
 data/jail.map   |  39 +++++++++++++++++++++++++++
 data/mapa.lua   |  28 ++++++++++++++++++++
 data/test.map   |   1 +
 data/tiles.gif  | Bin 1578 -> 1668 bytes
 6 files changed, 143 insertions(+), 5 deletions(-)
 create mode 100644 data/jail.map

diff --git a/data/editor.lua b/data/editor.lua
index 1b61c28..b90a003 100644
--- a/data/editor.lua
+++ b/data/editor.lua
@@ -15,12 +15,56 @@ editor={
         menu.show({ {"NEW MAP",         editor.new},
                     {"LOAD MAP",        function() textbox.show("FILENAME TO LOAD:",editor.load, mapa.name) end},
                     {"SAVE MAP",        function() if mapa.name~=nil then editor.save(mapa.name) else textbox.show("FILENAME TO SAVE:",editor.save, mapa.name) end end},
---                    {"BACK TO EDITOR",  function() editor.paused=false end},
+                    {mapa.front_layer and "DISABLE FRONT LAYER" or "ENABLE FRONT LAYER", editor.toggle_front_layer},
+                    {"RESIZE MAP",      editor.resize},
                     {"EXIT",            main_init},
---                    {"ENNER LLOR NEIM", function() textbox.show("PELANDRUSC!") end}
                 }, function()editor.paused=false end)
     end,
 
+    toggle_front_layer=function()
+        if not mapa.front_layer then
+            mapa.front_layer=newsurf(mapa.w,mapa.h)
+            editor.editing_front_layer=true
+            setmap(mapa.front_layer)
+            for y=0,mapa.h-1 do
+                for x=0,mapa.w-1 do
+                    mset(x,y,0)
+                end
+            end
+        else
+            mapa.front_layer=nil
+        end
+        editor.paused=false
+    end,
+
+    resize=function()
+        textbox.show("NEW MAP WIDTH:",function(value)
+                                        editor.new_w=value
+                                        textbox.show("NEW MAP HEIGHT:", function(value)
+                                                                            editor.new_h=value
+                                                                            editor.do_resize()
+                                                                        end, tostring(mapa.h))
+                                      end, tostring(mapa.w))
+    end,
+
+    do_resize=function()
+        local old_surface= mapa.surface
+        mapa.w=tonumber(editor.new_w)
+        mapa.h=tonumber(editor.new_h)
+        mapa.surface=newsurf(mapa.w,mapa.h)
+        for y=0,mapa.h-1 do
+            for x=0,mapa.w-1 do
+                setmap(old_surface)
+                local value=mget(x,y)
+                setmap(mapa.surface)
+                mset(x,y,value)
+            end
+        end
+        freesurf(old_surface)
+        setmap(mapa.surface)
+        editor.paused=false
+    end,
+
     floodfill=function(x,y,tile)
         local t=mget(x,y)
         mset(x,y,tile)
@@ -92,8 +136,18 @@ editor={
         cls()
         camera(editor.cam.x, editor.cam.y)
         setsource(tiles)
+        setmap(mapa.surface)
         map(0,0,0,0,mapa.w, mapa.h)
-
+        if mapa.front_layer then
+            setmap(mapa.front_layer)
+            map(0,0,0,0,mapa.w, mapa.h)
+        end
+        if editor.editing_front_layer then
+            setmap(mapa.front_layer)
+            text("EDITING FRONT LAYER",12,2,10)
+        else
+            setmap(mapa.surface)
+        end
         local mx,my=mousex()+editor.cam.x,mousey()+editor.cam.y
         local tx,ty=mx>>3,my>>3
         local rx,ry=tx<<3,ty<<3
@@ -149,6 +203,13 @@ editor={
             if btnp(KEY_F) then
                 editor.floodfill(tx,ty,editor.brush.tiles[1])
             end
+            if btnp(KEY_1) then
+                if editor.editing_front_layer then
+                    editor.editing_front_layer=nil
+                else
+                    editor.editing_front_layer=true
+                end
+            end
             if btnp(KEY_RETURN) then
                 editor.brush.tiles[1]=mget(tx,ty)
             end
@@ -188,6 +249,7 @@ editor={
 
     new=function()
         mapa.new(128,128)
+        editor.editing_front_layer=nil
         editor.paused=false
     end,
 
@@ -198,6 +260,7 @@ editor={
 
     load=function(filename)
         mapa.load(filename)
+        editor.editing_front_layer=nil
         editor.paused=false
     end
 }
diff --git a/data/game.lua b/data/game.lua
index fa8aa69..ddc485f 100644
--- a/data/game.lua
+++ b/data/game.lua
@@ -4,8 +4,8 @@ game={
     restart=function()
         flags={}
         objects.list={}
-        actors.main={name="jailer",x=6,y=9,o="r",gfx={x=32,y=0},level="test"}
-        game.init("test")
+        actors.main={name="jailer",x=6,y=9,o="r",gfx={x=32,y=0},level="jail"}
+        game.init("jail")
     end,
 
     init=function(levelname,f,objs)
@@ -133,9 +133,16 @@ game={
         end
         camera(game.cam.x, game.cam.y)
         setsource(tiles)
+        setmap(mapa.surface)
         map(0,0,0,0,mapa.w, mapa.h)
         setsource(sprites)
         actors.draw()
+        if mapa.front_layer then
+            setsource(tiles)
+            setmap(mapa.front_layer)
+            map(0,0,0,0,mapa.w, mapa.h)
+        end
+        setmap(mapa.surface)
         camera(0,0)
 
         if not scene.script and hero and not hero.path and hero.dx+hero.dy==0 then
diff --git a/data/jail.map b/data/jail.map
new file mode 100644
index 0000000..d152bb9
--- /dev/null
+++ b/data/jail.map
@@ -0,0 +1,39 @@
+20
+18
+2
+17,25,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,27,17,
+17,16,23,24,23,24,23,24,23,24,23,24,23,24,23,24,23,24,18,17,
+17,16,39,40,39,40,39,40,39,40,39,40,39,40,39,40,39,40,18,17,
+17,16,55,56,55,56,55,56,55,56,55,56,55,56,55,56,55,56,18,17,
+17,16,10,11,12,13,5,2,10,11,12,13,5,2,10,11,12,13,18,17,
+17,16,87,88,89,90,5,2,87,88,89,90,5,2,87,88,89,90,18,17,
+17,16,10,11,12,13,5,2,10,11,12,13,5,2,10,11,12,13,18,17,
+17,16,87,88,89,90,5,2,87,88,89,90,5,2,64,65,66,65,18,17,
+17,16,10,11,12,13,5,2,10,11,12,13,5,2,80,81,82,81,18,17,
+17,16,87,88,89,90,5,2,87,88,89,90,5,2,96,97,97,98,18,17,
+17,16,10,11,12,13,5,2,10,11,12,13,5,2,5,2,5,3,18,17,
+17,16,87,88,89,90,5,2,87,88,89,90,5,2,5,2,5,2,18,17,
+17,16,10,11,12,13,5,2,10,11,12,13,5,2,5,2,5,2,18,17,
+17,16,87,88,89,90,5,2,87,88,89,90,5,2,5,2,5,2,18,17,
+17,16,5,2,5,2,5,2,5,2,5,2,5,2,14,15,12,13,18,17,
+17,32,33,33,33,48,5,2,49,33,33,48,5,2,49,33,33,33,34,17,
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,71,72,71,72,0,0,71,72,71,72,0,0,71,72,71,72,0,0,
+0,0,67,68,69,70,0,0,67,68,69,70,0,0,67,68,69,70,0,0,
+0,0,71,72,71,72,0,0,71,72,71,72,0,0,71,72,71,72,0,0,
+0,0,67,68,69,70,0,0,67,68,69,70,0,0,67,68,69,70,0,0,
+0,0,71,72,71,72,0,0,71,72,71,72,0,0,0,0,0,0,0,0,
+0,0,67,68,69,70,0,0,67,68,69,70,0,0,0,0,0,0,0,0,
+0,0,71,72,71,72,0,0,71,72,71,72,0,0,0,0,0,0,0,0,
+0,0,67,68,69,70,0,0,67,68,69,70,0,0,0,0,0,0,0,0,
+0,0,71,72,71,72,0,0,71,72,71,72,0,0,0,0,0,0,0,0,
+0,0,67,68,69,70,0,0,67,68,69,70,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,71,72,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,84,69,70,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/data/mapa.lua b/data/mapa.lua
index 1082106..6908bc1 100644
--- a/data/mapa.lua
+++ b/data/mapa.lua
@@ -23,6 +23,8 @@ mapa={
             io.input(file)
             mapa.w = tonumber(io.read())
             mapa.h = tonumber(io.read())
+            local num_layers=tonumber(io.read())
+
             mapa.new(mapa.w, mapa.h)
             mapa.name=filename
             for y=0,mapa.h-1 do
@@ -33,6 +35,21 @@ mapa={
                     x=x+1
                 end
             end
+
+            if num_layers==2 then
+                mapa.front_layer=newsurf(mapa.w,mapa.h)
+                setmap(mapa.front_layer)
+
+                for y=0,mapa.h-1 do
+                    local line = io.read()
+                    local x=0
+                    for m in string.gmatch(line, "%d+") do
+                        mset(x,y,m)
+                        x=x+1
+                    end
+                end
+            end
+            setmap(mapa.surface)
             io.close(file)
         end
     end,
@@ -44,12 +61,23 @@ mapa={
             io.output(file)
             io.write(mapa.w.."\n")
             io.write(mapa.h.."\n")
+            if mapa.front_layer then io.write("2\n") else io.write("1\n") end
+            setmap(mapa.surface)
             for y=0,mapa.h-1 do
                 for x=0,mapa.w-1 do
                     io.write(mget(x,y)..",")
                 end
                 io.write("\n")
             end
+            if mapa.front_layer then
+                setmap(mapa.front_layer)
+                for y=0,mapa.h-1 do
+                    for x=0,mapa.w-1 do
+                        io.write(mget(x,y)..",")
+                    end
+                    io.write("\n")
+                end
+            end
             io.close(file)
         end
     end,
diff --git a/data/test.map b/data/test.map
index 10d4995..84678a3 100644
--- a/data/test.map
+++ b/data/test.map
@@ -1,5 +1,6 @@
 128
 128
+1
 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
diff --git a/data/tiles.gif b/data/tiles.gif
index a541a9db8c837e8456dcb24a811ccf34f89e6f8e..3503a1297f2354431e43cae8f60eb46f44ef385a 100644
GIT binary patch
delta 1233
zcmV;?1TOok41^7^q5*#Zf`ftz1rHAe3JMU5j*E?tkdB9mk&>8@m57|3o}Y?~1q2AC
zrUapvqo${+nXeFpgoXv7ueXx5wz!iJy1&4|zrMPptO%&W#;nQ0&bqRLnU{~$j@FaB
zjGCel-rwNhp#{DU4x<O@>Zs=J=LG8O1?IKx_V>|++WY*~*Sde<0)_)P?_Iof?ChaC
zn6TcxhYs=qm_`v3wr#jB!m22W9z2Ex-7SpQFeF5G68ov-rIDk*M<ELwJYZ7f%$PM#
zM$G5(TF-1hZ(YP@GMG-I?HuZCC$W*!ZBL^@ohr2|)vH#sZp*o}>p89v4Tv?MYpmI^
zWycyLz_zX1wWWXm-pY*|SFYPqXY=aKyX=@>1QI2hO}m${fxds4CH{+eF@n92^^$t_
z3vl3QgKI@L+<0;4#Gn609<3HZfdr^it4>hB@?}Dq3vAY0+OcBWr*NAhO?q+y2EZ9K
z7~X&ZYuB#@#hxv@w(ih=p&#Qt+IMi`#f`U44jV1)!ry-n`<+R?JW1Vny;J^W*1B-w
z!H;tvv>Y<$=;$3wXBB&W_{qYtf*k|f%?Chz;58>!W0U#!3^Muk=U;oK`G;I`2<mm;
zF_SIe;fDo$DB_3<w6<Sv`#eUS0R{#p;d&HuXxeY_ofh1UHy(E)U0y+mUW<aM=U|MA
z*;pfuIOcz7V*h@mI51pWPqyWNkGcVw&x@21nVXTov4&)lT`q}Ulcju8=9D{LXyt)p
znMa<MbaAQOmtgA1Bmxd_QYIp2Qi<D|vY6%OOmIRdr<Y(V>8EW?>WM%nrJ$J~pxucz
z=s|_L7bcxa+BqhkT`lSurS!FVsXBtnb-;{Da*BWBaR=BXYpf2kH7TiVQYR6o39x!(
zB8h5;fUAi*xE`*72_u#;yLRg9rnLln9I;@6<<&XJN~A1V!8H5ovvUR;=CI=8xXCBz
zf|6}M+cKLEuizpo?zH9Jcy7A*CbDicZyG?Jw>icuXPvE4o8-OuqFcbevh@4!yUrdu
zaHoF-*Be~_Eut7Z&cX~2;_yt`3L~(=!fLG4wF-6YF`@o~oR3wt_#!hwGuI3dR##c;
z6~`*C2-zU3aL6;z3=XaG(U);+@-sy%6WuRJM}4J&KBMK)ObLnf5lICZEp^mn8Q|)G
z2@pVM*IUbT&q!)x`}Nylb2^}LX5;ww-A8}NjpN*O)A==J(EyG&Y_fgHci%TQ@ONTf
zxAvFUck2z@;fPPJxYUmO)i~pW6E3#p!*yEsdzY(>aKfnTJ9yXunt~mC1hiht(o1Jd
z`!5-H9=5E!yQMSA3K@dPE*9}p2|2pU_USRd1D}-eiL8{%@Cqbv!1Amh4L$Lav?ONA
z@Ug5e+u`lCXs?U(n4E9D^C%tNkN4fL&%QZGYh^#qjmSTL=ltUu_Wbngp8&1&KL8H!
zfCjpr0RXrY1Uk?~k4as+9!S9}JqBa6SWoUM$U)^iW_uhtUidm#K?QEle#fgG36cgS
zUmEd<NKB#<m&n8>I`N56jG`2$NX05z@rqc?q87Kv#V&gBi(m|+7{^G)GMe#>XiTFT
v*T}{;y77&0jH4XqNXI(b@s4=RqaOFj$3FV;kAMuMAO}gvLK?D+fdBwIh%|W!

delta 1143
zcmV--1c>{D4XO;Vq5*#j1rHAe3JMU1iie4djEaMW5CD{wl#ZB-5RrtPo}ZuvmZPMl
zrl+TZ1%{cet*eHnu8xVDu(!Cmu#>30zP|vOjkLnTva^qftOXFw&d<-wyuj4e!N}OH
z$Fsw>%+TP`tJBuysKuDWn#QHb>h9===JTo9_KVx`*zd`T^#6aO^eN(ph#e_c1X~g0
z2e2W4S_L6Wj7V`}B2yMCYRt&7phJKLLK=W2vZP3oA_*WsK%k||mnvDVgh_MeOqwrO
zn%v2AXUvsAg9fcu5@k=L27U@%Dw8QwrA~qNoXS(Bu3QL+o?Jy0Db%P<!2<mnm8#j4
z2nr-v%eHNT0$G3msTJiq)vMT`WS!<^diJc<1PlT*Xh66DgST;k%`MQCZpgh$Aq$lp
zw6EE}f(siy3|DJNq&w{jJwUp&>C>o9Q<l2*YOa!)2NxEM*z-uoJVoQZdv~?Y)~;{C
zPCGcLW(J+*wr<QA?c}t<qldk_I67{t))W6)%zXIs0t<h_iw7^hym`33WoFa<5mj~T
z-gm1N%o#BK`<$nXRq3F=|Ns86*PbcwMHk;#Y1tRpTMFX0AbPyn<N#qVQRtEb0uD$@
zfx#VU(|ojn=-`9;fyLiSprDAMhP{-O+KUHxD3gfwjTmByQSsLaiiD_`A&Zr`2qS7T
z#`a)?4kCY+p8t+LBH+nND*{QNNJA3ooO}&3Xd{VBA^_l*{rxDVkX4rEB25P*NS~Hl
zB6a{yaK33>0R%`nrDdidd6=3ZCQyiti0NtLoY6_C%V)XdiC+SI9=Qsja0xnM0bo`N
zrYJxjdK)f^-p447Y(k2Fqz-Zd%Bi6k`r4+qbh>|Lqcye}>6Z7Iit4R}NSRtlskurU
ztf7t=D6RC_itDMEvbd`Oy_TZqr&-dN<gCO7w#p%dUaN|(RyIq@RlrKSC|udDV(Gd5
zC9C1G-j0&dILyQg?<Vxd>rF=!QHt)l>JDfbRdxm}FeR*(3ri)zee2r53=`bkza}B<
zRKI@!z{M2*#SH^Fk^zDqmjD4sN__FR6K6c|#(Exi7|8b_{1pKd(-|4YCi}}6k}9u^
z<Sj2>)$_qMvxqW%IqOWczI37n^Os4VwzLB@2mQ~`ffa3Z)eRs`fYSQ@*R*O#ORXW*
zR$pD1)?72awbNmX-QLE<0j1e&1jM~k*9Cu|)-`~6pN6;FZ!-qx;4kf+3%|H{4fsbJ
zNBGs=`$i7+;tn;=+vCS(jx6O3ZESEZ*nW;n=$wPZnB-szLI^7h#S;lLrB8i2>Hu!C
z`bM}*^tuAE)3Y({0QTPd@4)*feC)&*@4)e;8-RcT%J;`S=gu3TIjYlBUcI(+lAdNg
z;MJ>Mh==Q|lk<Jh;lGaW?&r7f{`>I9FaP}X*Khy*_~)<x{`~jv|Nj6Cpa2I*zyccZ
zfCx;W0vE`@20HM85R9M%CrH5xTJVAx%%BE0$iWVJ@Pi->p$JDv!V;SBgeXj*3X%pT
J1&$&R06Q$dM}+_Y