diff --git a/data/m_prac1.lua b/data/m_prac1.lua index 55162af..7dc9f65 100644 --- a/data/m_prac1.lua +++ b/data/m_prac1.lua @@ -2,7 +2,8 @@ levels["prac1"]={ load=function() mapa.load("prac1.map") - --actors.add({name="estudiant",x=10,y=8,o="d",gfx={x=64,y=48}}) + actors.add({name="profe",x=6,y=5,o="d",gfx={x=192,y=0}}) + actors.add({name="comp_1_1",x=4,y=9,o="d",gfx={x=160,y=0},action=levels.prac1.comp_updating_action}) actors.add({name="comp_2_1",x=6,y=9,o="d",gfx={x=176,y=0},action=levels.prac1.comp_updating_action}) actors.add({name="comp_1_2",x=4,y=11,o="d",gfx={x=160,y=0},action=levels.prac1.comp_updating_action}) @@ -19,31 +20,32 @@ levels["prac1"]={ actors.add({name="comp_profe",x=4,y=6,o="d",gfx={x=96,y=0},action=levels.prac1.comp_profe_action}) actors.add({name="taula_profe",x=6,y=6,o="d",gfx={x=160,y=16}}) + + actors.add({name="alumne1",x=4,y=10,o="d",gfx={x=0,y=96}}) + actors.add({name="alumne2",x=12,y=12,o="d",gfx={x=16,y=96}}) + actors.add({name="alumne3",x=14,y=12,o="d",gfx={x=32,y=96}}) + actors.add({name="alumne4",x=6,y=12,o="d",gfx={x=48,y=96}}) + + actors.add({name="alumne5",x=6,y=14,o="r",gfx={x=96,y=48}}) --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=8,y=8,w=1,h=3,action= + switches.add({x=4,y=14,w=10,h=1,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 + 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() balloon.show("OYE TU!",9,"profe",false,{x=4,w=6,h=1}) end, + function() actors.search("profe").path={pos=0,route='rrrdddddd'} end, + function() balloon.show("TE PARECE HORA DE LLEGAR\nA LA PRÁCTICA?",9,"profe",false,{x=3,w=14,h=2}) 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 + }) end }) end, diff --git a/data/sprites.gif b/data/sprites.gif index 7f5614b..33d1754 100644 Binary files a/data/sprites.gif and b/data/sprites.gif differ