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 24eb6ab..e1f046d 100644 Binary files a/data/tiles.gif and b/data/tiles.gif differ diff --git a/data/vella.map b/data/vella.map index 23681a9..f246f6f 100644 --- a/data/vella.map +++ b/data/vella.map @@ -29,7 +29,7 @@ 33,33,32,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,34, 33,33,32,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,34, 33,33,32,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,34, -33,33,32,10,11,10,11,10,11,10,11,10,11,132,133,10,11,10,11,10,11,132,133,10,11,150,244,244,244,244,244,244,244,244,244,11,11,11,11,11,11,11,11,10,11,10,11,10,11,10,11,34, +33,33,32,10,11,10,11,10,11,10,11,10,11,132,133,10,11,10,11,10,11,132,133,10,11,10,11,10,11,10,11,10,11,10,11,11,11,11,11,11,11,11,11,10,11,10,11,10,11,10,11,34, 33,33,32,10,11,10,11,10,11,10,11,10,11,132,133,10,11,10,11,10,11,132,133,10,11,150,213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,34, 33,33,32,10,11,10,11,10,11,10,11,10,11,132,133,10,11,10,11,10,11,132,133,10,11,150,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,34, 33,33,32,10,11,10,11,10,11,10,11,10,11,132,133,10,11,10,11,10,11,132,133,10,11,150,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,34, @@ -63,8 +63,8 @@ 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,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,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,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,166,165,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,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,234,235,234,235,234,235,234,235,234,235,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,166,165,0,0,0,0,0,0,0,0,0,0,150,243,243,243,243,243,243,243,243,243,243,143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,164,0,0,0,0,0,0,167,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,166,166,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,164,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,