diff --git a/data/game.ini b/data/game.ini index 41da662..d294666 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,m_arq.lua,m_prac2.lua,m_prac1.lua,m_jail1.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_arq.lua,m_prac3.lua,m_prac2.lua,m_prac1.lua,m_jail1.lua,main.lua diff --git a/data/game.lua b/data/game.lua index 47cb3ae..53606df 100644 --- a/data/game.lua +++ b/data/game.lua @@ -5,7 +5,7 @@ game={ restart=function() flags={} objects.list={} - actors.main={name="jailer",x=40,y=26,o="r",gfx={x=32,y=0},level="arq"} + actors.main={name="jailer",x=10,y=26,o="r",gfx={x=32,y=0},level="arq"} game.init("arq") end, diff --git a/data/m_arq.lua b/data/m_arq.lua index a47561e..e04d723 100644 --- a/data/m_arq.lua +++ b/data/m_arq.lua @@ -47,7 +47,7 @@ levels["arq"]={ if hero.o=="u" then game.paused = true fade.fadeout() - actors.main.x=9 + actors.main.x=6 actors.main.y=16 actors.main.o="u" actors.main.level="prac3" diff --git a/data/m_prac3.lua b/data/m_prac3.lua new file mode 100644 index 0000000..cd6d0b2 --- /dev/null +++ b/data/m_prac3.lua @@ -0,0 +1,103 @@ +levels["prac3"]={ + load=function() + mapa.load("prac3.map") + + actors.add({name="profe",x=11,y=5,o="u",gfx={x=224,y=0}}) + + actors.add({name="comp_1_1",x=4,y=9,o="d",gfx={x=160,y=0},action=levels.prac3.comp_updating_action}) + actors.add({name="comp_2_1",x=6,y=9,o="d",gfx={x=176,y=0},action=levels.prac3.comp_updating_action}) + actors.add({name="comp_1_2",x=4,y=11,o="d",gfx={x=160,y=0},action=levels.prac3.comp_updating_action}) + actors.add({name="comp_2_2",x=6,y=11,o="d",gfx={x=176,y=0},action=levels.prac3.comp_updating_action}) + actors.add({name="comp_1_3",x=4,y=13,o="d",gfx={x=160,y=0},action=levels.prac3.comp_updating_action}) + actors.add({name="comp_2_3",x=6,y=13,o="d",gfx={x=176,y=0},action=levels.prac3.comp_updating_action}) + + actors.add({name="comp_3_1",x=12,y=9,o="d",gfx={x=160,y=0},action=levels.prac3.comp_updating_action}) + actors.add({name="comp_4_1",x=14,y=9,o="d",gfx={x=176,y=0},action=levels.prac3.comp_updating_action}) + actors.add({name="comp_3_2",x=12,y=11,o="d",gfx={x=160,y=0},action=levels.prac3.comp_updating_action}) + actors.add({name="comp_4_2",x=14,y=11,o="d",gfx={x=176,y=0},action=levels.prac3.comp_updating_action}) + actors.add({name="comp_3_3",x=12,y=13,o="d",gfx={x=160,y=0},action=levels.prac3.comp_updating_action}) + actors.add({name="comp_4_3",x=14,y=13,o="d",gfx={x=176,y=0},action=levels.prac3.comp_updating_action}) + + actors.add({name="comp_profe",x=6,y=6,o="d",gfx={x=96,y=0},action=levels.prac3.comp_profe_action}) + actors.add({name="taula_profe",x=8,y=6,o="d",gfx={x=160,y=16}}) + + actors.add({name="alumne1",x=12,y=14,o="d",gfx={x=32,y=64}}) + actors.add({name="alumne2",x=6,y=10,o="d",gfx={x=16,y=96}}) + actors.add({name="alumne3",x=4,y=12,o="d",gfx={x=96,y=64}}) + actors.add({name="alumne4",x=4,y=10,o="d",gfx={x=96,y=64}}) + actors.add({name="alumne5",x=14,y=12,o="d",gfx={x=64,y=64}}) + --actors.add({name="taza_usufondo",x=14,y=15,o="d",gfx={x=112,y=32},action=levels.jail1.taza_usufondo_action}) + --if not objects.search("diskito_usufondo") then actors.add({name="disquito_usufondo",x=15,y=10,o="d",gfx={x=96,y=32},action=levels.jail1.disquito_usufondo_action}) end + + --actors.add({name="usufondo",x=16,y=14,o="d",gfx={x=0,y=0}}) + + switches.add({x=6,y=16,w=1,h=1,action= + function() + local hero = actors.search(actors.main.name) + if hero.o=="d" then + game.paused = true + fade.fadeout() + actors.main.x=8 + actors.main.y=25 + actors.main.o="d" + actors.main.level="arq" + game.init("arq") + return true + else + return false + end + end + }) + + switches.add({x=6,y=15,w=1,h=1,action= + function() + local hero = actors.search(actors.main.name) + if hero.o=="u" then + scene.start({ + function() balloon.show("...COMO IBA DICIENDO...",12,"profe",true,{x=4,w=13,h=1}) end, + function() balloon.show("...BLAH BLAH BLAH...",12,"profe",true,{x=4,w=13,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, + + comp_profe_action=function() + local hero = actors.search(actors.main.name) + if hero.o~="d" then return end + scene.start({ + function() balloon.show("PAREIX QUE NO FUNCIONA...",2,"jailer",true,{x=1,w=13,h=1}) end + }) + end, + + taza_usufondo_action=function() + local hero = actors.search(actors.main.name) + if hero.o~="d" then return end + scene.start({ + function() balloon.show("EL CAFÉ DE USUFONDO.\nESTÀ GELAT COM EL COR DEL DIMONI!",2,"jailer",true,{x=1,w=15,h=2}) end + }) + end, + + disquito_usufondo_action=function() + local hero = actors.search(actors.main.name) + --if hero.o~="d" then return end + scene.start({ + function() balloon.show("NO ÉS EL MEU DISQUITO,\nPERÒ ME'L QUEDE!\nIGUAL ES IMPORTANT",2,"jailer",true,{x=1,w=15,h=3}) end, + function() actors.remove("disquito_usufondo") scene.cont() end, + function() objects.collect("diskito_usufondo") scene.cont() end, + }) + end, + +} \ No newline at end of file diff --git a/data/prac3.map b/data/prac3.map index bb60b1f..2786a42 100644 --- a/data/prac3.map +++ b/data/prac3.map @@ -3,11 +3,11 @@ 1 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17, 17,17,17,25,26,26,26,26,26,26,26,26,26,26,26,26,27,17,17,17, -17,17,17,16,23,24,23,24,102,103,103,104,23,24,23,24,18,17,17,17, -17,17,17,16,39,40,39,40,118,119,119,120,39,40,39,40,18,17,17,17, -17,17,17,16,55,56,55,56,55,56,55,56,47,56,55,56,18,17,17,17, -17,17,17,16,5,2,5,2,5,2,5,2,63,2,5,2,18,17,17,17, -17,17,17,16,87,88,89,90,5,2,5,2,5,2,5,2,18,17,17,17, +17,17,17,16,23,24,23,24,23,24,102,103,103,104,23,24,18,17,17,17, +17,17,17,16,39,40,39,40,39,40,118,119,119,120,39,40,18,17,17,17, +17,17,17,16,55,56,55,56,55,56,55,56,55,56,55,47,18,17,17,17, +17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,63,18,17,17,17, +17,17,17,16,5,2,87,88,89,90,5,2,5,2,5,2,18,17,17,17, 17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17, 17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17, 17,17,17,16,87,88,89,90,5,2,5,2,87,88,89,90,18,17,17,17, @@ -17,5 +17,5 @@ 17,17,17,16,87,88,89,90,5,2,5,2,87,88,89,90,18,17,17,17, 17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17, 17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17, -17,17,17,32,33,33,33,33,48,2,5,49,33,33,33,33,34,17,17,17, +17,17,17,32,33,48,2,5,49,33,33,33,33,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, diff --git a/data/sprites.gif b/data/sprites.gif index 33d1754..f3cc87c 100644 Binary files a/data/sprites.gif and b/data/sprites.gif differ diff --git a/data/test.map b/data/test.map index f626059..f774e41 100644 --- a/data/test.map +++ b/data/test.map @@ -4,15 +4,15 @@ 18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,25,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,101,5,2,5,2,5,2,5,2,18, 18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,5,2,5,2,5,2,5,2,18, 18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,23,24,23,24,23,24,19,20,21,22,23,24,23,24,23,24,23,24,23,24,23,24,23,24,5,2,5,2,5,2,5,2,18, -18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,39,40,39,40,39,40,35,36,75,76,39,40,39,40,39,40,41,42,39,40,107,108,77,78,5,2,5,2,5,2,5,2,18, -18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,47,56,57,58,59,56,51,52,91,92,55,56,57,58,59,56,47,56,55,56,123,124,93,94,5,2,5,2,5,2,5,2,18, -18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,63,2,7,8,9,2,5,2,5,2,5,2,7,8,9,2,63,2,5,2,139,140,109,110,5,2,5,2,5,2,5,2,18, +18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,39,40,39,40,39,40,35,36,75,76,79,40,39,40,39,40,41,42,39,40,107,108,77,78,5,2,5,2,5,2,5,2,18, +18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,47,56,57,58,59,56,51,52,91,92,55,56,57,58,59,56,55,56,47,56,123,124,93,94,5,2,5,2,5,2,5,2,18, +18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,63,2,7,8,9,2,5,2,5,2,5,2,7,8,9,2,5,2,63,2,139,140,109,110,5,2,5,2,5,2,5,2,18, 100,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,101,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18, 28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18, 23,24,23,24,19,20,21,22,23,24,19,20,21,22,23,24,23,24,23,24,19,20,21,22,23,24,23,24,23,24,23,24,19,20,21,22,23,24,23,24,5,2,5,2,5,2,5,2,84,86,86,86,86,86,86,86,86,86,86,86,86,86,86,85,5,2,5,2,5,2,5,2,18, -39,40,41,42,35,36,37,38,41,42,35,36,37,38,39,40,39,40,39,40,35,36,75,76,39,40,39,40,39,40,39,40,35,36,37,38,41,42,39,40,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18, -55,56,57,58,59,52,53,54,47,56,51,52,53,54,55,56,57,58,59,56,51,52,91,92,55,56,47,56,57,58,59,56,51,52,53,54,55,56,47,56,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18, -5,2,7,8,9,2,5,2,63,2,5,2,5,2,5,2,7,8,9,2,5,2,5,2,5,2,63,2,7,8,9,2,5,2,5,2,5,2,63,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18, +39,40,39,40,35,36,37,38,79,40,35,36,37,38,79,40,39,40,41,42,35,36,75,76,79,40,39,40,39,40,41,42,35,36,37,38,79,40,39,40,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18, +55,56,57,58,59,52,53,54,55,56,51,52,53,54,55,56,47,56,55,56,51,52,91,92,55,56,57,58,59,47,55,56,51,52,53,54,55,56,47,56,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18, +5,2,7,8,9,2,5,2,5,2,5,2,5,2,5,2,63,2,5,2,5,2,5,2,5,2,7,8,9,63,5,2,5,2,5,2,5,2,63,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18, 5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18, 5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18, 84,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,85,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18, @@ -24,9 +24,9 @@ 100,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,101,5,2,5,2,5,2,5,2,100,26,26,26,26,26,26,26,26,26,26,26,26,26,26,101,5,2,5,2,5,2,5,2,18, 28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,5,2,5,2,5,2,5,2,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,5,2,5,2,5,2,5,2,18, 23,24,23,24,23,24,19,20,21,22,23,24,23,24,23,24,23,24,19,20,21,22,23,24,23,24,23,24,23,24,19,20,21,22,23,24,23,24,23,24,5,2,5,2,5,2,5,2,23,24,23,24,23,24,19,20,21,22,23,24,23,24,23,24,5,2,5,2,5,2,5,2,18, -39,40,39,40,39,40,35,36,75,76,41,42,39,40,39,40,39,40,35,36,75,76,41,42,39,40,39,40,39,40,35,36,75,76,41,42,39,40,39,40,5,2,5,2,5,2,5,2,39,40,39,40,39,40,35,36,75,76,41,42,39,40,39,40,5,2,5,2,5,2,5,2,18, -55,56,55,56,55,56,51,52,91,92,47,56,55,56,57,58,59,56,51,52,91,92,55,56,55,56,57,58,59,56,51,52,91,92,47,56,55,56,55,56,5,2,5,2,5,2,5,2,55,56,47,56,57,58,59,52,91,92,47,56,57,58,59,56,5,2,5,2,5,2,5,2,18, -5,2,5,2,5,2,5,2,5,2,63,2,5,2,7,8,9,2,5,2,5,2,5,2,5,2,7,8,9,2,5,2,5,2,63,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,63,2,7,8,9,2,5,2,63,2,7,8,9,2,5,2,5,2,5,2,5,2,18, +39,40,39,40,41,42,35,36,75,76,79,40,39,40,39,40,39,40,35,36,75,76,79,40,41,42,39,40,39,40,35,36,75,76,79,40,41,42,39,40,5,2,5,2,5,2,5,2,39,40,39,40,41,42,35,36,75,76,79,40,39,40,39,40,5,2,5,2,5,2,5,2,18, +55,56,55,56,55,56,51,52,91,92,55,56,47,56,57,58,59,56,51,52,91,92,55,56,55,56,57,58,59,56,51,52,91,92,55,56,55,56,47,56,5,2,5,2,5,2,5,2,57,58,59,56,55,56,47,52,91,92,55,56,57,58,59,56,5,2,5,2,5,2,5,2,18, +5,2,5,2,5,2,5,2,5,2,5,2,63,2,7,8,9,2,5,2,5,2,5,2,5,2,7,8,9,2,5,2,5,2,5,2,5,2,63,2,5,2,5,2,5,2,5,2,7,8,9,2,5,2,63,2,5,2,5,2,7,8,9,2,5,2,5,2,5,2,5,2,18, 5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18, 5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18, 33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,34, diff --git a/data/tiles.gif b/data/tiles.gif index 0d13621..fd1dfab 100644 Binary files a/data/tiles.gif and b/data/tiles.gif differ