From 52c117dffb12776ff22abb59f4635f73453c01fe Mon Sep 17 00:00:00 2001
From: JailDoctor <jaildoctor@gmail.com>
Date: Thu, 2 Feb 2023 19:54:46 +0100
Subject: [PATCH] =?UTF-8?q?-=20WIP:=20Interacci=C3=B3=20amb=20els=20actors?=
 =?UTF-8?q?=20-=20Levels=20-=20Crec=20que=20no=20fa=20falta=20el=20segon?=
 =?UTF-8?q?=20layer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/actors.lua  |  14 +++++++++++
 data/game.ini    |   2 +-
 data/game.lua    |  34 +++++----------------------
 data/jail.map    |  30 +++++-------------------
 data/m_jail1.lua |  60 +++++++++++++++++++++++++++++++++++++++++++++++
 data/sprites.gif | Bin 1388 -> 1523 bytes
 6 files changed, 87 insertions(+), 53 deletions(-)
 create mode 100644 data/m_jail1.lua

diff --git a/data/actors.lua b/data/actors.lua
index dd8b43e..86bbd98 100644
--- a/data/actors.lua
+++ b/data/actors.lua
@@ -60,6 +60,20 @@ actors={
         return false
     end,
 
+    interact=function(x,y,o)
+        for i,actor in ipairs(actors.list) do
+            if o=='d' then
+                if actor.x==x and actor.y==y+1 then if actor.action then actor.action() end end
+            elseif o=='u' then
+                if actor.x==x and actor.y==y-1 then if actor.action then actor.action() end end
+            elseif o=='l' then
+                if actor.y==y and actor.x==x-2 then if actor.action then actor.action() end end
+            elseif o=='r' then
+                if actor.y==y and actor.x==x+2 then if actor.action then actor.action() end end
+            end
+        end
+    end,
+
     update=function()
         if actors.updating then return end
         actors.updating=true
diff --git a/data/game.ini b/data/game.ini
index da7f740..a070c1f 100644
--- a/data/game.ini
+++ b/data/game.ini
@@ -3,4 +3,4 @@ config=ja2
 width=160
 height=144
 zoom=5
-files=fade.lua,objects.lua,wait.lua,switches.lua,scene.lua,balloon.lua,actors.lua,game.lua,mapa.lua,editor.lua,textbox.lua,menu.lua,main.lua
+files=fade.lua,objects.lua,wait.lua,switches.lua,scene.lua,balloon.lua,actors.lua,game.lua,mapa.lua,editor.lua,textbox.lua,menu.lua,m_jail1.lua,main.lua
diff --git a/data/game.lua b/data/game.lua
index ddc485f..40c134a 100644
--- a/data/game.lua
+++ b/data/game.lua
@@ -1,11 +1,12 @@
+levels={}
 game={
     cam={x=0,y=0},
     
     restart=function()
         flags={}
         objects.list={}
-        actors.main={name="jailer",x=6,y=9,o="r",gfx={x=32,y=0},level="jail"}
-        game.init("jail")
+        actors.main={name="jailer",x=6,y=9,o="r",gfx={x=32,y=0},level="jail1"}
+        game.init("jail1")
     end,
 
     init=function(levelname,f,objs)
@@ -19,32 +20,7 @@ game={
             actors.add({name=actors.main.name,x=actors.main.x,y=actors.main.y,o=actors.main.o,gfx=actors.main.gfx})
         end
 
-        mapa.load(game.level..".map")
-
-        actors.add({name="estudiant",x=12,y=8,o="d",gfx={x=64,y=0}})
-
-        switches.add({x=8,y=8,w=1,h=3,action=
-            function()
-                if not flags.usu1 then
-                    flags.usu1=1
-                    scene.start({
-                        function() actors.add({name="usufondo",x=16,y=8,o="d",gfx={x=0,y=0}}) scene.cont() end,
-                        function() wait.start(1) end,
-                        function() actors.search("usufondo").path={pos=0,route='dlllll'} end,
-                        function() balloon.show("HOY NO HAY JAIL!\nTU MISMO!!",10,"usufondo",false,{x=7,w=10,h=2}) end,
-                        function() objects.collect("diskito_usufondo") end,
-                        function() actors.search("usufondo").path={pos=0,route='rrrrru'} end,
-                        function() wait.start(0.5) end,
-                        function() actors.remove("usufondo") scene.cont() end,
-                        function() wait.start(1) end,
-                        function() balloon.show("IMBÈSIL...",2,"jailer",true,{x=5,w=7,h=1}) end
-                    })
-                    return true
-                else
-                    return false
-                end
-            end
-        })
+        levels[game.level].load()
 
         if game.paused then
             game.resume()
@@ -154,6 +130,8 @@ game={
                 hero.path={pos=0,route='l',keys=true}
             elseif btn(KEY_RIGHT) then
                 hero.path={pos=0,route='r',keys=true}
+            elseif btnp(KEY_SPACE) then
+                actors.interact(hero.x,hero.y,hero.o)
             end
         end
         if btnp(KEY_ESCAPE) then
diff --git a/data/jail.map b/data/jail.map
index d152bb9..a210890 100644
--- a/data/jail.map
+++ b/data/jail.map
@@ -1,39 +1,21 @@
 20
 18
-2
+1
 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,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,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,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,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,5,2,5,2,5,2,5,2,5,2,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,5,2,5,2,5,2,5,2,5,2,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,5,2,5,2,5,2,5,2,5,2,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/m_jail1.lua b/data/m_jail1.lua
new file mode 100644
index 0000000..8a29775
--- /dev/null
+++ b/data/m_jail1.lua
@@ -0,0 +1,60 @@
+levels["jail1"]={
+    load=function()
+        mapa.load("jail.map")
+
+        actors.add({name="estudiant",x=12,y=8,o="d",gfx={x=64,y=0}})
+        actors.add({name="comp_1_1",x=2,y=5,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_2_1",x=4,y=5,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_1_2",x=2,y=7,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_2_2",x=4,y=7,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_1_3",x=2,y=9,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_2_3",x=4,y=9,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_1_4",x=2,y=11,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_2_4",x=4,y=11,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_1_5",x=2,y=13,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_2_5",x=4,y=13,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+
+        actors.add({name="comp_3_1",x=8,y=5,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_4_1",x=10,y=5,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_3_2",x=8,y=7,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_4_2",x=10,y=7,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_3_3",x=8,y=9,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_4_3",x=10,y=9,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_3_4",x=8,y=11,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_4_4",x=10,y=11,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_3_5",x=8,y=13,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_4_5",x=10,y=13,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+
+        switches.add({x=8,y=8,w=1,h=3,action=
+            function()
+                if not flags.usu1 then
+                    flags.usu1=1
+                    scene.start({
+                        function() actors.add({name="usufondo",x=16,y=8,o="d",gfx={x=0,y=0}}) scene.cont() end,
+                        function() wait.start(1) end,
+                        function() actors.search("usufondo").path={pos=0,route='dlllll'} end,
+                        function() balloon.show("HOY NO HAY JAIL!\nTU MISMO!!",10,"usufondo",false,{x=7,w=10,h=2}) end,
+                        function() objects.collect("diskito_usufondo") end,
+                        function() actors.search("usufondo").path={pos=0,route='rrrrru'} end,
+                        function() wait.start(0.5) end,
+                        function() actors.remove("usufondo") scene.cont() end,
+                        function() wait.start(1) end,
+                        function() balloon.show("IMBÈSIL...",2,"jailer",true,{x=5,w=7,h=1}) end
+                    })
+                    return true
+                else
+                    return false
+                end
+            end
+        })
+    end,
+
+    comp_updating_action=function()
+        local hero = actors.search(actors.main.name)
+        if hero.o~="d" then return end
+        scene.start({
+            function() balloon.show("NO VAN ELS COMPS\nESTAN TOTS ACTUALITZANT",2,"jailer",true,{x=1,w=15,h=2}) end
+        })
+    end,
+
+}
\ No newline at end of file
diff --git a/data/sprites.gif b/data/sprites.gif
index 79d3c540099fa4baba0e877b5e40064ae5aae61e..9f45870666b0f07247fce125cb6430f4662f3a24 100644
GIT binary patch
delta 1376
zcmV-m1)uut3iAt)q<>uTo;(#4%AD?&BOMe=8q%1<Vsh-@w#a2CV$EI`r0w=Qr9<xQ
zT<tXP<$IZB21q4obZCQcac+r<b6Ix}kq-`6bOm;olvsT)S$&3rfrEuvqM}>{1d0TX
zBdM#cEs&Cw1xs2El9QF5p@f0AoWV%CgSTbIqd`xqajaI&ZGX=@Ef0b_k#`2xkC(-~
z)uF{@++DusMB9S8k>u&(w1Fa-sR#D=tZ4Q3_W6|64j43Oz(63uTtU>;%63T|iAfI-
zY_o;{VnS=g;yJ8Va9~G*49Y2FH_0JA0{r^_Wg4@OpT9XJ9t?~$^9w+O9~mI@6mg<~
ziZ-|9k{IcyMSq?%Wj3&u?m<qRA$^=odB7h_lqp|!+k?V{QkqL`b|ER&D^ZF}=}gpB
zHfGYA%aRnJx{}P?lq+HC!DK6487rMysGE_NL?E(lnYt)^CMLTVb*CJX3x(yGzgrM>
z;elu4Wdj64i}vM-z>spEA*fzWx(kHUaVN{3ZKs;GXnzPy7wxLYmga}IrTOG7+VpSR
z1|TR{uHf}<Ppe=5E<m!n_3L^$fmw{&+$Xg^&u$X7efjWt1(sV`&tAPF0}B?oh;IhI
zd>2K`n=qeW!HoVc@W+IHfdN3>1F_)XO8+*zeSu#QVnOI&fxYDL!h_qvaA1N88pt4c
z6n5BPh<_q_7h#DgD!2|UW|-KbU`<F!;$>sJ7-Nbe;?fQ{UFE`}j5qf3A0UU+hsKLI
z{;*yiv((~87$62oBN=&2hGdeKu(!#QQ9>zXkfB&<NRe3L&>L4<0XE_vUwS#^kv+<G
zWtr+MiQ1W4WT6;rZN{ijk$28ECze9txz0s+UVkA{Nki-uP9KXRL#3mC9@$-)GCqM}
zp?f$A<97gg;i(HXc2ek(o?<FPXfCk2rltjMW10yBbSF%N+q`B11h$f@#Eh!8U|Mmk
znpO&Evz9O`9X$!)tN=#&^;5Dx;rf98fBYDrK%m;{T7rLr5?V%R(iry+vZMVbNVNh)
z0)MSUq`2@bwCa}OUqJ<FyRMMg9v5s^!8zlZV7Q(4r~&hO6%4}e8a$W*_%fhygAp72
zZ<kVn>SD$SKN~A~YE^vV#aYm20)0i89D}yte(PU;Lk`$7%k|A1uBs1W2%d!#jtnEu
z36Tga$z9?cGoeQlo#dIMY&RpDK-vhW5Pv!=9p@9NrrA)`Rc~CM2~>&^w$+9p_{61`
zVU0G(eNq@^nEv{z1lc_@q-ohuTnaYSUdQSq+)dL6_{~e#f@Udp_t4<4I`8e~8Ir)g
z$=_qs4Y5ak@puN8Jw|&p*v3?SIsZYRPab)VbYE6eQF-8$xh<do#X2BA0ps`TjDKZ;
zQ|YP8qBgEb;C|wY?V#P5?716OjPZg9Pk7;mhsbpDz_D)R@-42Vm>AgiPC^gJ8X3LM
zpLSdyTjbAR&-sy)Pc#q`6#>4o*-I1?v{ajbKg=cMn|}!hcpjY)5<jOIhkA%J-*(n;
zD5+V)f8a3>LIfzT?a{$xgs_HuAb&K$Jm?2r)_55hIw-Sm9ZH0~gHH)In6mqvjD=m%
z4+`l(AeVU%Tr-TJ%><Oft~H1^QCnGCg7||WdhduxOrjE($iyZ(@rh83q7<h{#VT6y
zidf8|7PrX7E_(5cU<{)e$4JI-GMe#>XiTFT*T}{;y77&0jH4XqNXI(b@mY>|%%dLn
z$j3hV@sEHEq#y@L$U++OkcdpAA{WWXMmqA5kc^}xCrQalTJn;Z%%mna$;nQ7@{^zp
ir6@;9%2Jy0l&DOlDp$$MR=V<)u#BZFXF13a002APhnmL#

delta 1240
zcmV;}1Sk9R3+xJzq<_RYV>+I6If_n;LmG2fOnMzu(ii+JGYiOFI&75|*jad%2{s^0
z<dl7!H<zOh4}uR4J5)MpXoZJyT2*m+V0U|Vhjo*EeolacgoY@bgN1LPc$alcjgBpQ
zos*!Fr<IzU4|Y3(Y6iAdYObFown(mEyd<W`j=Of9g2hCp#DA-_P=pK(4Gh=WfkDfo
zxoFG5fe5>{2!zJpfuhgB+Su{g4C}(pgyYmUB@ftw|CCviw~ax!M-R*iGLTMSxpNHF
zLEH7uUjtjv9?aWVFU-CoZhDlWc+nz8J?A?Atum1iVnaswR`#nH(BnsxJQBTu1}5ar
zRLf?Z6w|NSi+^JnT?}neC+4)9k$SqJ^eE>deN4d+*vggaF#<!3Wi<eytXZ$DAcVCE
zwZ%dL2;w3DyRg)hJD}dmoeQxPSFm`iEQFw-umZJpADLAfxUG;zTa=1D1{ozog_BuT
z9$C1r;~xtaxCrgh0BILRI-BU6TEUFgE?6^Bee^RHEq|zQ=XjAj@^0L<N7~->`eu`l
z$A|A@CW>ux%f)X8hxNsIbme+{c_Kx}RcT0(uUFxdX?%6;XMD2JK1vQ3=+Co`VMCs+
z<2E4=`Q-j+Gv)W@)fd%#==HK6e=Qt{p#LgB`L~CF0rFv=aklJ-6@F6*)`(aPYFHnK
z<Ta+;E`L(pWe<ji*n`Rp2f4MOH~GxhB0KYCW}6FB97Q6A%uKY|jzhGl*@G(z7K;}>
z7TCg8E-*P#2{}%)3s@!)Fd2h~JfM~d5M1d3lGEJ?)?ZA5HJ$-XRw-pm0<<YWL_9G>
zWeMhF>DmE!9$<h1Anv(k39e0OoK|qj#bh5<{(ps5CFTeq$eZRMYJ!_@Hdcvi+Gw-q
zEdS-Hr-;KXQ|MlF0W~US8BOXYOAR{uz?+G=SVE=@usRa0o}t$ve7*fQ2TGI%w`(c5
zJ~iTLC6HFcX;9F%r)#N+SB0~(=@DrEnAqjkt8h^8hAp=JdGoEYO8P1&4)JM{Zn-z$
zSAX7<<PNzlyv`B$7`UP8gocd?O7X6|(gJMkmq>PT9=puAVdEbDF6^Jc(>+LJc?2tg
za69=$@_@pOR05#6;xRX|C3hTL;4SKDym5y8DRG?%D{jl2Fc!nIkjc6hv=cDnSr`eN
zFPjqcAqBxqaXU1Fny&)^EyRY-P$I|_oPSQ!!O+l=G`&<6MI%$LyIW_a^;0uT)CJXH
zGvx}uc8q=QpriZ*Qo{qQG%(U;7h!j4cnhhd6(u-HN8I4f&}M0S|KI|ih!2AAjWd`t
z_fKfr#1Knw-djTE(au_{<_74=?&)~wd>43+_1bcHWO1Q>ge{sz)>$`iw}m<z$ba@I
z8Wyy(p<1N2K)Xfnvjyr}H^P4{nrW8jZrbkF8gIF?&-yOC4AfWq_q^O5BVD|jmGZrP
zwShnS`RJ#w{`%~<@BaJn$1nf<^w)3y{rKmv|Ni{<@BjY*44?o9NWcOb@PG(RpaK`j
zzy><-fe?(K1Sd$r3R>`j7|fssH&MvJ4tnr|APk`hM@YgFn(%}uOrZ)_$if!7@P#mp
zp$un8!y4M~hB(Zj4tL1I9{TWyKn$V~he*UC8u5roOrjE($iyZ(@rh83q7;7^0suQ8
C0AF|j