chameleonic.p8

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