Compare commits

...

3 Commits

Author SHA1 Message Date
49284d44a8
Fix syntax errors. 2023-01-02 16:25:18 -08:00
b2dbd9ec60
_calc_push golf redux
Removed unnecessary variable declarations and conditional cases by using an "assume, alternate, verify assumption" pattern and reusing ax0/ay0 when they would never be referenced again.
2023-01-02 16:22:10 -08:00
cb36faac23
Fix syntax errors.
This also saves a few tokens and cycles by turning level:tug_crate into a free function. It's not _pretty_ but it's the least bad option.
2023-01-02 16:04:42 -08:00

View File

@ -656,7 +656,10 @@ end
-- argument is a rope operation:
-- array of [mx0,my0,dmx,dmy]
function level:tug_crate(t)
-- must be a free function
-- to use as a foreach target
function level_tug_crate(t)
local self=level
local mx0,my0,dmx,dmy=unpack(t)
local mxy0=_mix{mx0,my0}
local existing=self._crates[mxy0]
@ -1557,7 +1560,7 @@ function rope:_tug(hypothetically)
if #ops>0 then
if (hypothetically) return ancs,i-1,ops,blocks
foreach(ops, level:tug_crate)
foreach(ops, level_tug_crate)
return true
end
end
@ -1610,7 +1613,7 @@ function rope:_tug(hypothetically)
if level:can_move(false,mv,1,0) then
if (hypothetically) return ancs,0,{mv},blocks
level:tug_crate(mv)
level_tug_crate(mv)
return true
else
add(blocks, mv)
@ -1643,21 +1646,16 @@ function rope:_calc_push(
smy=-smy
end
local mx,dmx
local dmx=1 -- maybe push right?
if anch.adx==-1 and a0.x>an.x+7 then
-- push left
mx=ax0-1
dmx=-1
elseif anch.adx==1 and a0.x<an.x-7 then
-- push right
mx=ax0
dmx=1
else
ax0, dmx=ax0-1,-1
elseif anch.adx!=1 or a0.x>=an.x-7 then
return {}
end
for my=my0,my1,smy do
add(ops,{mx,my,dmx,0})
add(ops,{ax0,my,dmx,0})
end
end
@ -1669,30 +1667,24 @@ function rope:_calc_push(
smx=-smx
end
local my,dmy
local dmy=1 -- maybe push down?
if anch.ady==-1 and a0.y>an.y+6 then
-- push up
my=ay0-1
dmy=-1
elseif anch.ady==1 and a0.y<an.y-6 then
-- push down
my=ay0
dmy=1
else
ay0,dmy=ay0-1,-1
elseif anch.ady!=1 or a0.y>=an.y-6 then
return {}
end
for mx=mx0,mx1,smx do
add(ops,{mx,my,0,dmy})
add(ops,{mx,ay0,0,dmy})
end
end
local ops2,blocked={},{}
for o in all(ops) do
local mx,my=unpack(o)
if level:mcoll(mx,my)
if not (level:get_crate(mx, my)) break
if level:mcoll(mx,my) then
if (not level:get_crate(mx, my)) break
if not level:can_move(false,o,0,0) then
add(blocked,o)
break