diff --git a/data/game.lua b/data/game.lua index b590e5e..3a628ad 100644 --- a/data/game.lua +++ b/data/game.lua @@ -12,15 +12,15 @@ require "m_jail1" require "m_prac1" require "m_prac2" require "m_prac3" - +require "m_repro" game={ cam={x=0,y=0}, restart=function() flags={} objects.list={} - actors.main={name="jailer",x=25,y=6,o="r",gfx={x=32,y=0},level="jail1"} - game.init("jail1") + actors.main={name="jailer",x=9,y=14,o="u",gfx={x=32,y=0},level="repro"} + game.init("repro") end, init=function(levelname,f,objs) diff --git a/data/m_arq.lua b/data/m_arq.lua index 3c639da..2ea1ee8 100644 --- a/data/m_arq.lua +++ b/data/m_arq.lua @@ -77,6 +77,24 @@ levels["arq"]={ end }) + switches.add({x=56,y=25,w=1,h=1,action= + function() + local hero = actors.search(actors.main.name) + if hero.o=="u" then + game.paused = true + fade.fadeout() + actors.main.x=9 + actors.main.y=16 + actors.main.o="u" + actors.main.level="repro" + game.init("repro") + return true + else + return false + end + end + }) + end, estudiant1_action=function() diff --git a/data/m_repro.lua b/data/m_repro.lua new file mode 100644 index 0000000..8937ce1 --- /dev/null +++ b/data/m_repro.lua @@ -0,0 +1,64 @@ +levels["repro"]={ + load=function() + mapa.load("repro.map") + + actors.add({name="taula1_a",x=3,y=12,o="r",gfx={x=160,y=0}}) + actors.add({name="taula1_b",x=5,y=12,o="d",gfx={x=176,y=32}}) + actors.add({name="taula2_a",x=7,y=12,o="d",gfx={x=176,y=32}}) + actors.add({name="taula2_b",x=9,y=12,o="d",gfx={x=176,y=32},action=levels.repro.currante1_action}) + actors.add({name="taula3_a",x=11,y=12,o="d",gfx={x=176,y=32}}) + actors.add({name="taula3_b",x=13,y=12,o="l",gfx={x=160,y=0}}) + actors.add({name="porteta",x=15,y=12,o="d",gfx={x=176,y=64}}) + actors.add({name="comp",x=3,y=6,o="d",gfx={x=96,y=0}}) + actors.add({name="impresora",x=5,y=6,o="d",gfx={x=176,y=16}}) + + actors.add({name="currante1",x=9,y=11,o="d",gfx={x=16,y=48}}) + actors.add({name="currante2",x=4,y=5,o="d",gfx={x=16,y=80}}) + + switches.add({x=9,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=56 + 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=15,y=13,w=1,h=1,action= + function() + local hero = actors.search(actors.main.name) + if hero.o=="u" then + scene.start({ + function() balloon.show("NO POTS PASAR!",12,"currante1",false,{x=5,w=10,h=1}) end, + function() balloon.show("NOMES EL QUALIFICAT PERSONAL\nDE REPROGRAFIA POR ENTRAR ACÍ",12,"currante1",false,{x=2,w=17,h=2}) end + }) + return true + else + return false + end + end + }) + + end, + + currante1_action=function() + local hero = actors.search(actors.main.name) + scene.start({ + function() balloon.show("BON DIA!",12,"currante1",false,{x=6,w=7,h=1}) end, + function() balloon.show("QUINS APUNTES\nNECESSITES?",12,"currante1",false,{x=6,w=8,h=2}) end, + function() balloon.show("NO TINC NI IDEA",2,"jailer",true,{x=5,w=10,h=1}) end, + function() balloon.show("POS MAL ANEM...",12,"currante1",false,{x=5,w=10,h=1}) end, + function() balloon.show("TORNA QUAN SAPIGUES\nEL QUE VOLS",12,"currante1",false,{x=4,w=12,h=2}) end, + }) + end, + +} \ No newline at end of file diff --git a/data/repro.map b/data/repro.map new file mode 100644 index 0000000..dc7b810 --- /dev/null +++ b/data/repro.map @@ -0,0 +1,21 @@ +20 +18 +1 +17,17,25,26,26,26,26,26,26,26,26,26,26,26,26,26,26,27,17,17, +17,17,16,23,24,23,24,23,24,23,24,23,24,23,24,23,24,18,17,17, +17,17,16,41,42,39,40,39,40,99,99,79,40,99,99,79,40,18,17,17, +17,17,16,55,56,55,56,47,56,115,115,55,56,115,115,55,56,18,17,17, +17,17,16,5,2,5,2,63,2,99,99,5,2,99,99,5,2,18,17,17, +17,17,16,5,2,5,2,5,2,115,115,5,2,115,115,5,2,18,17,17, +17,17,16,87,88,89,90,5,2,99,99,5,2,99,99,5,2,18,17,17, +17,17,16,5,2,5,2,5,2,115,115,5,2,115,115,5,2,18,17,17, +17,17,16,14,15,105,106,5,2,131,131,5,2,131,131,5,2,18,17,17, +17,17,16,87,88,89,90,5,2,147,147,5,2,147,147,5,2,18,17,17, +17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17, +17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,5,14,18,17,17, +17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17, +17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17, +17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17, +17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17, +17,17,32,33,33,33,33,33,48,5,2,49,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, diff --git a/data/sprites.gif b/data/sprites.gif index f3cc87c..eb2dab3 100644 Binary files a/data/sprites.gif and b/data/sprites.gif differ diff --git a/data/tiles.gif b/data/tiles.gif index fd1dfab..4e50a38 100644 Binary files a/data/tiles.gif and b/data/tiles.gif differ