From eb7ee7427b1e8d9352c69bb3a73400583545fa2c Mon Sep 17 00:00:00 2001 From: JailDoctor Date: Tue, 7 Feb 2023 20:07:14 +0100 Subject: [PATCH] - treballant en prac1 --- data/m_prac1.lua | 42 ++++++++++++++++++++++-------------------- data/sprites.gif | Bin 4160 -> 4913 bytes 2 files changed, 22 insertions(+), 20 deletions(-) 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 7f5614b348e2fb97290a0301399d330382e7e7ab..33d17545dce2ddd53b6c6d03d4ca4264ffebb405 100644 GIT binary patch delta 4806 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 delta 4047 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