- Conectats els mapes de EUI i exterior amb la resta

- [FIX] La càmera no se resetjava al carregar un nou mapa en el editor
- [FIX] El joc no funcionava si venies de l'editor
This commit is contained in:
2025-01-09 13:08:32 +01:00
parent 56109ec776
commit b15da3338e
8 changed files with 189 additions and 157 deletions

View File

@@ -5,9 +5,9 @@ levels["arq"]={
actors.add({name="prohibit1",x=6,y=10,o="d",gfx={x=192,y=48},action=levels.arq.prohibit_action})
actors.add({name="prohibit2",x=12,y=10,o="d",gfx={x=192,y=48},action=levels.arq.prohibit_action})
actors.add({name="tallat1",x=0,y=11,o="d",gfx={x=208,y=48},action=levels.arq.tallat_action})
actors.add({name="tallat2",x=0,y=12,o="d",gfx={x=208,y=48},action=levels.arq.tallat_action})
actors.add({name="tallat3",x=0,y=13,o="d",gfx={x=208,y=48},action=levels.arq.tallat_action})
--actors.add({name="tallat1",x=0,y=11,o="d",gfx={x=208,y=48},action=levels.arq.tallat_action})
--actors.add({name="tallat2",x=0,y=12,o="d",gfx={x=208,y=48},action=levels.arq.tallat_action})
--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})
@@ -41,6 +41,42 @@ levels["arq"]={
actors.add({name="alutablo7",x=3,y=27,o="d",gfx={x=0,y=96}})
end
switches.add({x=0,y=11,w=1,h=3,action=
function()
local hero = actors.search(actors.main.name)
if hero.o=="l" then
game.paused = true
fade.fadeout()
actors.main.x=61
actors.main.y=36
actors.main.o="l"
actors.main.level="exterior"
game.init("exterior")
return true
else
return false
end
end
})
switches.add({x=0,y=25,w=1,h=3,action=
function()
local hero = actors.search(actors.main.name)
if hero.o=="l" then
game.paused = true
fade.fadeout()
actors.main.x=61
actors.main.y=50
actors.main.o="l"
actors.main.level="exterior"
game.init("exterior")
return true
else
return false
end
end
})
switches.add({x=32,y=25,w=1,h=1,action=
function()
local hero = actors.search(actors.main.name)
@@ -132,22 +168,22 @@ levels["arq"]={
})
switches.add({x=66,y=3,w=4,h=1,action=
function()
local hero = actors.search(actors.main.name)
if hero.o=="u" then
game.paused = true
fade.fadeout()
actors.main.x=6
actors.main.y=33
actors.main.o="u"
actors.main.level="vella"
game.init("vella")
return true
else
return false
function()
local hero = actors.search(actors.main.name)
if hero.o=="u" then
game.paused = true
fade.fadeout()
actors.main.x=6
actors.main.y=33
actors.main.o="u"
actors.main.level="vella"
game.init("vella")
return true
else
return false
end
end
end
})
})
switches.add({x=6,y=25,w=1,h=3,action=
function()