JailDoctor/jailsadventure2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Reposicionament dels actors

Browse Source 
- Ja se comprova colisió amb altres actors i el mapa
- Ja no fa un pas de mes al començar una escena
- Reposicionats alguns tiles del piso
This commit is contained in:
Raimon Zamora
2023-02-02 15:37:39 +01:00
parent 4593b8b712
commit 545dc96545
5 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
data/actors.lua
View File

@@ -34,17 +34,32 @@ actors={
for i,v in ipairs(actors.list) do
local frame=((v.dx+v.dy)%2)*16
if v.o=='u' then
sspr(v.gfx.x+frame,v.gfx.y+16,16,16,v.x*8-4+v.dx*2,v.y*8-12+v.dy*2,16,16,v.dy>1)
sspr(v.gfx.x+frame,v.gfx.y+16,16,16,v.x*8+v.dx*2,v.y*8-12+v.dy*2,16,16,v.dy>1)
elseif v.o=='d' then
sspr(v.gfx.x+frame,v.gfx.y,16,16,v.x*8-4+v.dx*2,v.y*8-12+v.dy*2,16,16,-v.dy>2)
sspr(v.gfx.x+frame,v.gfx.y,16,16,v.x*8+v.dx*2,v.y*8-12+v.dy*2,16,16,-v.dy>2)
elseif v.o=='l' then
sspr(v.gfx.x+frame,v.gfx.y+32,16,16,v.x*8-4+v.dx*2,v.y*8-12+v.dy*2,16,16)
sspr(v.gfx.x+frame,v.gfx.y+32,16,16,v.x*8+v.dx*2,v.y*8-12+v.dy*2,16,16)
elseif v.o=='r' then
sspr(v.gfx.x+frame,v.gfx.y+32,16,16,v.x*8-4+v.dx*2,v.y*8-12+v.dy*2,16,16,true)
sspr(v.gfx.x+frame,v.gfx.y+32,16,16,v.x*8+v.dx*2,v.y*8-12+v.dy*2,16,16,true)
end
end
end,
check_collision=function(x,y,o)
for i,actor in ipairs(actors.list) do
if o=='u' then
if actor.y==y-1 and (actor.x==x-1 or actor.x==x or actor.x==x+1) then return true end
elseif o=='d' then
if actor.y==y+1 and (actor.x==x-1 or actor.x==x or actor.x==x+1) then return true end
elseif o=='l' then
if actor.y==y and actor.x==x-2 then return true end
elseif o=='r' then
if actor.y==y and actor.x==x+2 then return true end
end
end
return false
end,
update=function()
if actors.updating then return end
actors.updating=true
@@ -61,7 +76,9 @@ actors={
v.keys=nil
if v.name == actors.main.name then
local switch = switches.search(v.x,v.y)
if switch then switch.action() end
if switch then
if switch.action() then v.path=nil end
end
end
end
if v.path and v.path.pos ~= #v.path.route then
@@ -69,26 +86,30 @@ actors={
local step=string.sub(v.path.route,v.path.pos,v.path.pos)
if step=='u' then
v.o='u'
--check collision!
v.y=v.y-1
v.dy=4
needs_sorting=true
if not actors.check_collision(v.x,v.y,v.o) and not mapa.check_collision(v.x,v.y-1) then
v.y=v.y-1
v.dy=4
needs_sorting=true
end
elseif step=='d' then
v.o='d'
--check collision!
v.y=v.y+1
v.dy=-4
needs_sorting=true
if not actors.check_collision(v.x,v.y,v.o) and not mapa.check_collision(v.x,v.y+1) then
v.y=v.y+1
v.dy=-4
needs_sorting=true
end
elseif step=='l' then
v.o='l'
--check collision!
v.x=v.x-1
v.dx=4
if not actors.check_collision(v.x,v.y,v.o) and not mapa.check_collision(v.x-1,v.y) then
v.x=v.x-1
v.dx=4
end
elseif step=='r' then
v.o='r'
--check collision!
v.x=v.x+1
v.dx=-4
if not actors.check_collision(v.x,v.y,v.o) and not mapa.check_collision(v.x+1,v.y) then
v.x=v.x+1
v.dx=-4
end
elseif step=='q' then
v.o='u'
elseif step=='a' then