forked from pyrex/chameleonic
Compare commits
3 Commits
rope_golf
...
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,12 +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]
|
|
||||||
-- must be a free function
|
|
||||||
-- to use as a foreach target
|
|
||||||
function level_tug_crate(t)
|
|
||||||
local self,mx0,my0,dmx,dmy=level,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
|
||||||
@ -741,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]
|
||||||
@ -1547,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
|
||||||
@ -1608,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
|
||||||
@ -1645,16 +1640,21 @@ function rope:_calc_push(
|
|||||||
smy=-smy
|
smy=-smy
|
||||||
end
|
end
|
||||||
|
|
||||||
local dmx=1 -- maybe push right?
|
local mx,dmx
|
||||||
if anch.adx==-1 and a0.x>an.x+7 then
|
if anch.adx==-1 and a0.x>an.x+7 then
|
||||||
-- push left
|
-- push left
|
||||||
ax0, dmx=ax0-1,-1
|
mx=ax0-1
|
||||||
elseif anch.adx!=1 or a0.x>=an.x-7 then
|
dmx=-1
|
||||||
|
elseif anch.adx==1 and a0.x<an.x-7 then
|
||||||
|
-- push right
|
||||||
|
mx=ax0
|
||||||
|
dmx=1
|
||||||
|
else
|
||||||
return {}
|
return {}
|
||||||
end
|
end
|
||||||
|
|
||||||
for my=my0,my1,smy do
|
for my=my0,my1,smy do
|
||||||
add(ops,{ax0,my,dmx,0})
|
add(ops,{mx,my,dmx,0})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -1666,26 +1666,38 @@ function rope:_calc_push(
|
|||||||
smx=-smx
|
smx=-smx
|
||||||
end
|
end
|
||||||
|
|
||||||
local dmy=1 -- maybe push down?
|
local my,dmy
|
||||||
if anch.ady==-1 and a0.y>an.y+6 then
|
if anch.ady==-1 and a0.y>an.y+6 then
|
||||||
-- push up
|
-- push up
|
||||||
ay0,dmy=ay0-1,-1
|
my=ay0-1
|
||||||
elseif anch.ady!=1 or a0.y>=an.y-6 then
|
dmy=-1
|
||||||
|
|
||||||
|
elseif anch.ady==1 and a0.y<an.y-6 then
|
||||||
|
-- push down
|
||||||
|
my=ay0
|
||||||
|
dmy=1
|
||||||
|
else
|
||||||
return {}
|
return {}
|
||||||
end
|
end
|
||||||
|
|
||||||
for mx=mx0,mx1,smx do
|
for mx=mx0,mx1,smx do
|
||||||
add(ops,{mx,ay0,0,dmy})
|
add(ops,{mx,my,0,dmy})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
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) then
|
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
|
||||||
add(blocked,o)
|
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)
|
||||||
|
break
|
||||||
|
end
|
||||||
|
else
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
add(ops2,o)
|
add(ops2,o)
|
||||||
|
Reference in New Issue
Block a user