forked from pyrex/chameleonic
Compare commits
3 Commits
78f0a96529
...
animate-bl
Author | SHA1 | Date | |
---|---|---|---|
8fe5d4dd43
|
|||
04d2a680dd
|
|||
7b931d1fba
|
@ -633,12 +633,10 @@ end
|
|||||||
|
|
||||||
ropecheck=split"-0.6,0.4,0.4"
|
ropecheck=split"-0.6,0.4,0.4"
|
||||||
|
|
||||||
-- argument "o" is a rope operation:
|
|
||||||
-- array of [mx0,my0,dmx,dmy]
|
|
||||||
function level:can_move(
|
function level:can_move(
|
||||||
is_player,o,exclude_src,exclude_dst
|
is_player,
|
||||||
|
mx0,my0,dmx,dmy,exclude_src,exclude_dst
|
||||||
)
|
)
|
||||||
local mx0,my0,dmx,dmy=unpack(o)
|
|
||||||
local mx1,my1=mx0+dmx,my0+dmy
|
local mx1,my1=mx0+dmx,my0+dmy
|
||||||
if (is_player and self:win_at(mx1,my1)) return true
|
if (is_player and self:win_at(mx1,my1)) return true
|
||||||
if (is_player and self:get_open_pit(mx1,my1)) return wrongbleep:adequately_warned()
|
if (is_player and self:get_open_pit(mx1,my1)) return wrongbleep:adequately_warned()
|
||||||
@ -654,10 +652,7 @@ function level:can_move(
|
|||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
-- argument is a rope operation:
|
function level:tug_crate(mx0,my0,dmx,dmy)
|
||||||
-- array of [mx0,my0,dmx,dmy]
|
|
||||||
function level:tug_crate(t)
|
|
||||||
local mx0,my0,dmx,dmy=unpack(t)
|
|
||||||
local mxy0=_mix{mx0,my0}
|
local mxy0=_mix{mx0,my0}
|
||||||
local existing=self._crates[mxy0]
|
local existing=self._crates[mxy0]
|
||||||
if (not existing) return
|
if (not existing) return
|
||||||
@ -739,7 +734,7 @@ function player:update()
|
|||||||
else
|
else
|
||||||
local x,y=self.x,self.y
|
local x,y=self.x,self.y
|
||||||
local function try_move(dx,dy,f)
|
local function try_move(dx,dy,f)
|
||||||
if level:can_move(true,{x,y,dx,dy},0,2) then
|
if level:can_move(true,x,y,dx,dy,0,2) then
|
||||||
self.todo=f
|
self.todo=f
|
||||||
self.cooldown=3
|
self.cooldown=3
|
||||||
local t=f[#f]
|
local t=f[#f]
|
||||||
@ -1545,19 +1540,22 @@ function rope:_tug(hypothetically)
|
|||||||
local blocks = {}
|
local blocks = {}
|
||||||
for i=#ancs-1,2,-1 do
|
for i=#ancs-1,2,-1 do
|
||||||
local ops_before_trash,blocks_before_trash=self:_calc_push(ancs[i+1],ancs[i],ancs[i-1],ancs[i-2])
|
local ops_before_trash,blocks_before_trash=self:_calc_push(ancs[i+1],ancs[i],ancs[i-1],ancs[i-2])
|
||||||
local ops = {}
|
local ops_to_do,corners={}
|
||||||
for b in all(blocks_before_trash) do add(blocks, b) end
|
for b in all(blocks_before_trash) do add(blocks, b) end
|
||||||
if #ops_before_trash>0 then
|
if #ops_before_trash>0 then
|
||||||
ops=ops_before_trash
|
ops_to_do=ops_before_trash
|
||||||
else
|
else
|
||||||
local ops_after_trash,blocks_after_trash=self:_calc_push(ancs[i-2],ancs[i-1],ancs[i],ancs[i+1])
|
local ops_after_trash,blocks_after_trash=self:_calc_push(ancs[i-2],ancs[i-1],ancs[i],ancs[i+1])
|
||||||
ops=ops_after_trash
|
ops_to_do=ops_after_trash
|
||||||
for b in all(blocks_after_trash) do add(blocks,b) end
|
for b in all(blocks_after_trash) do add(blocks,b) end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local ops=ops_to_do
|
||||||
|
|
||||||
if #ops>0 then
|
if #ops>0 then
|
||||||
if (hypothetically) return ancs,i-1,ops,blocks
|
if (hypothetically) return ancs,i-1,ops,blocks
|
||||||
foreach(ops, level:tug_crate)
|
|
||||||
|
for o in all(ops) do level:tug_crate(unpack(o)) end
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -1606,14 +1604,13 @@ function rope:_tug(hypothetically)
|
|||||||
end
|
end
|
||||||
|
|
||||||
if not invalid_move then
|
if not invalid_move then
|
||||||
local mv = {mx0,my0,dmx,dmy}
|
if level:can_move(false,mx0,my0,dmx,dmy,1,0) then
|
||||||
if level:can_move(false,mv,1,0) then
|
if (hypothetically) return ancs,0,{{mx0,my0,dmx,dmy}},blocks
|
||||||
if (hypothetically) return ancs,0,{mv},blocks
|
|
||||||
|
|
||||||
level:tug_crate(mv)
|
level:tug_crate(mx0,my0,dmx,dmy)
|
||||||
return true
|
return true
|
||||||
else
|
else
|
||||||
add(blocks, mv)
|
add(blocks, {mx0,my0,dmx,dmy})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -1690,13 +1687,19 @@ function rope:_calc_push(
|
|||||||
|
|
||||||
local ops2,blocked={},{}
|
local ops2,blocked={},{}
|
||||||
for o in all(ops) do
|
for o in all(ops) do
|
||||||
local mx,my=unpack(o)
|
local mx,my,dmx,dmy=unpack(o)
|
||||||
if level:mcoll(mx,my)
|
if not level:mcoll(mx,my) then
|
||||||
if not (level:get_crate(mx, my)) break
|
-- great!
|
||||||
if not level:can_move(false,o,0,0) then
|
else
|
||||||
|
local crate=level:get_crate(mx,my)
|
||||||
|
if crate then
|
||||||
|
if not level:can_move(false,mx,my,dmx,dmy,0,0) then
|
||||||
add(blocked,o)
|
add(blocked,o)
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
|
else
|
||||||
|
break
|
||||||
|
end
|
||||||
add(ops2,o)
|
add(ops2,o)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user