From 9930dcac549f45352b5a36a6172d47f2c3cf4d95 Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Sun, 1 Jun 2025 22:05:08 +0200 Subject: [PATCH] =?UTF-8?q?-=20Progr=C3=A9s...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/game.lua | 14 ++++++++++---- data/m_arq.lua | 36 ++++++++++++++++++++++-------------- data/tiles.gif | Bin 4347 -> 4358 bytes data/vella.map | 6 +++--- 4 files changed, 35 insertions(+), 21 deletions(-) diff --git a/data/game.lua b/data/game.lua index ef9f171..5a5666f 100644 --- a/data/game.lua +++ b/data/game.lua @@ -24,10 +24,10 @@ game={ restart=function() flags={} objects.list={} - actors.main={name="jailer",x=43,y=25,o="u",gfx={x=32,y=0},level="vella"} - game.init("vella") - --actors.main={name="jailer",x=8,y=12,o="l",gfx={x=32,y=0},level="arq"} - --game.init("arq") + --actors.main={name="jailer",x=43,y=25,o="u",gfx={x=32,y=0},level="vella"} + --game.init("vella") + actors.main={name="jailer",x=12,y=12,o="r",gfx={x=32,y=0},level="arq"} + game.init("arq") end, startfromeditor=function(s_level, s_x, s_y) @@ -58,6 +58,12 @@ game={ end game.resume() actors.sort() + if levels[game.level].init_scene then + if not flags.escena_inicial then + game.update() + levels[game.level].init_scene() + end + end fade.fadein() end, diff --git a/data/m_arq.lua b/data/m_arq.lua index 044e7e4..c1efb68 100644 --- a/data/m_arq.lua +++ b/data/m_arq.lua @@ -10,7 +10,7 @@ levels["arq"]={ --actors.add({name="tallat3",x=0,y=13,o="d",gfx={x=208,y=48},action=levels.arq.tallat_action}) actors.add({name="estudiant1",x=18,y=11,o="r",gfx={x=0,y=48},action=levels.arq.estudiant1_action}) - actors.add({name="estudiant2",x=16,y=12,o="l",gfx={x=128,y=0},action=levels.arq.estudiant2_action}) + actors.add({name="estudiant2",x=14,y=12,o="l",gfx={x=128,y=0},action=levels.arq.estudiant2_action}) actors.add({name="estudiant3",x=34,y=25,o="r",gfx={x=128,y=48},action=levels.arq.estudiant3_action}) actors.add({name="estudiant4",x=27,y=25,o="d",gfx={x=0,y=64},action=levels.arq.estudiant4_action}) @@ -198,23 +198,31 @@ levels["arq"]={ end end }) + end, + init_scene=function() + flags.escena_inicial=1 + scene.start({ + function() wait.start(1) end, + function() actors.face("estudiant2", "jailer") scene.cont() end, + function() balloon.show("QUE GANES DE SEGUIR\nAMB EL JAILGAME!",2,"jailer",false,{x=4,w=12,h=2}) end, + function() balloon.show("ME'L VAIG DEIXAR EN\nUN DISKITO EN UN\nCOMP DE LA JAIL",2,"jailer",false,{x=4,w=12,h=3}) end, + function() balloon.show("SEGUR QUE ENCARA ESTÀ!\nDINS DEL COMP",12,"estudiant2",false,{x=2,w=13,h=2}) end, + function() balloon.show("ANEM A ENTRAR\n A LA JAIL!",12,"estudiant2",false,{x=5,w=10,h=2}) end, + function() actors.search("estudiant2").o='u' scene.cont() end, + function() actors.moveto("jailer", 12, 11) end, + function() balloon.show("PERO QUÉ...",2,"jailer",false,{x=4,w=8,h=1}) end, + function() balloon.show("'JAIL CERRADA POR\nACTUALIZACIONES\n¡TU MISMO!'",2,"jailer",false,{x=2,w=10,h=3}) end, + function() balloon.show("AÇÒ ES COSA D'USUFONDO!\nSERÀ MAMÓ!",2,"jailer",false,{x=2,w=14,h=2}) end, + function() balloon.show("HE DE TROBAR LA\nFORMA D'ACONSEGUIR\nEL MEU DISKITO...",2,"jailer",false,{x=2,w=11,h=3}) end, + function() actors.search("estudiant2").o='l' scene.cont() end, + }) end, prohibit_action=function() - if not flags.jail_tancada_llegit then - flags.jail_tancada_llegit=1 - scene.start({ - function() balloon.show("PERO QUÉ...",2,"jailer",false,{x=4,w=8,h=1}) end, - function() balloon.show("'JAIL CERRADA POR\nACTUALIZACIONES\n¡TU MISMO!'",2,"jailer",false,{x=2,w=10,h=3}) end, - function() balloon.show("AÇÒ ES COSA D'USUFONDO!\nSERÀ MAMÓ!",2,"jailer",false,{x=2,w=14,h=2}) end, - function() balloon.show("HE DE TROBAR LA\nFORMA D'ACONSEGUIR\nEL MEU DISKITO...",2,"jailer",false,{x=2,w=11,h=3}) end, - }) - else - scene.start({ - function() balloon.show("LA JAIL 1\nCONTINUA TANCADA...",2,"jailer",false,{x=4,w=12,h=2}) end, - }) - end + scene.start({ + function() balloon.show("LA JAIL 1\nCONTINUA TANCADA...",2,"jailer",false,{x=4,w=12,h=2}) end, + }) end, tallat_action=function() diff --git a/data/tiles.gif b/data/tiles.gif index 24eb6ab5755f76aea8635b51d6aa99a98827a3a7..e1f046d93c7aeb7de0353be6fc6487355d14863c 100644 GIT binary patch delta 557 zcmV+|0@D5aA%-Hb%MJrAK{b=k4j+HHsuJM=q4P;vl95z5At025s|VqVsmcIokdN81 z7%0Pp!AhG=NUV0!AwbEbpSrA=wFc$Es>-z;_z{L~2qx7UdBV{u+A2LB$|q)ms5g{G zE83!8`;7?ZcMV8RFo zbRViA9|+*6x(G+p8nJh3Li!r6vKq7bff}Dthu&Be6*+mkxF;q1ubLVfLyK)IF)CLp za`<{eOADI+{5o7u8x$MsLO*|4s-}7@Q^^>;k*TVI0Ex&~=|~_h>!~qo9;i{P-zgw% zYZ`qxgSzpmW?{E(xHF{IOl8BgcX=EiLavRukd{gWUKq5K2W|gntquZP?Yc9{&m%@n-of^xY8oJA7Ta{lDllcyJe%hZJ>X!? zx(9Hsu4@MbD|QhnyF=%>NNKm+g1e)uAP87|gYmj|K^8-23)8_L zF1ZM`yRxGDyTJ>*!0Wpv(gxWJVZ)^brT{QAn@YW*k&sca&zrD-v8Gxuz42nb*9!^v vdj)WY3L^o?6Ej;E09+ju1z?dhSvn{ delta 546 zcmV+-0^R+FBKsk*%MJsUw?vc94j+GB6dn*dpQI%jNp%wfLP@xK5U!Z241fmtm>r9O zGE5k(wAqBj%0!)-91%*Nda(xO!K%u&9rzK3ZU`pS8hOIeD%mPM9?BEoRHIYD9P59We)>3l z1ZygY(5s=!rV1;sZP>65>#c)19xXar%aK%7Arj@ch;~Wy3rE2 zfdFtzYOPf^5F4Q^`ytAjw0di{=<15cXdP=RHb+6Y4ZAbSmA!=lJzsL2T*^mrE3QPD|Qj7 zx`CS%N=dlf0=t{5APP&l?Hudj)WY3IQm#sZ