Simplified anchors (broken)

Fix more known rope bugs
Fix can_move constants to remove path dependence
2022-12-29 15:16:19 -08:00 · 2022-12-29 14:54:08 -08:00 · 2022-12-28 13:23:34 -08:00 · 2022-12-28 21:12:23 +00:00 · 2022-12-23 17:33:06 -08:00 · 2022-12-23 16:09:57 -08:00
1 changed files with 162 additions and 137 deletions
--- a/chameleonic.p8
+++ b/chameleonic.p8
@ -7,6 +7,7 @@ real_modules={}

 frame=0
 function _init()
+ -- printh("restarting")
 _doall("init") end
 function _update()
 frame+=1
@ -344,6 +345,10 @@ function level:recollide()
 end
 end

+function level:anchor_for(axy)
+ return self._anch_by_axy[_mix(axy.ax,axy.ay)]
+end
+
 function level:reanchor()
 local anch_new={}
 for dxy in all{{-1,-1},{1,-1},{-1,1},{1,1}} do
@ -379,27 +384,30 @@ function level:reanchor()

 local anch_old=self._anch
 if (anch_old==nil) anch_old={}
- for _,old in pairs(anch_old) do
-  old.dropped=true
- end

 for k,new in pairs(anch_new) do
  local old=anch_old[k]
  if old then
   anch_new[k]=old
   old.ax_old,old.ay_old,old.ax,old.ay,old.adx,old.ady=old.ax,old.ay,new.ax,new.ay,new.adx,new.ady
-   old.dropped=nil
  end
 end
 self._anch=anch_new
 self._anch_keys={}
+ self._anch_by_axy={}
 for k,_ in pairs(self._anch) do
  add(self._anch_keys,{key=k})
 end
 shellsort(self._anch_keys)
 for point in self:anchor_points() do
-  if (point.ax_old and player.rope) player.rope:be_pushed_by(point,point.ax_old,point.ay_old)
+  if point.ax_old and player.rope and (point.ax_old != point.ax or point.ay_old != point.ay) then 
+   -- printh("moving: "..tostring({point.ax_old,point.ay_old}).."=>"..tostring({point.ax,point.ay}))
+   player.rope:be_pushed_by(point,point.ax_old,point.ay_old)
+  end
  point.ax_old,point.ay_old=nil,nil
+
+  local axykey=_mix(point.ax,point.ay)
+  self._anch_by_axy[axykey]=self._anch_by_axy[axykey] or point
 end

 if (player.rope) player.rope:relax()
@ -531,6 +539,8 @@ function level:get_latch(dx,dy,px,py)
 	end
 end

+ropecheck=split"-0.6,0.4,0.4"
+
 function level:can_move(
 is_player,
 mx0,my0,dmx,dmy,exclude_src,exclude_dst
@ -542,16 +552,9 @@ function level:can_move(
 if (self:mcoll(mx1,my1) or player.x==mx1 and player.y==my1) return false

 if player.rope then
-  local chk=false
-  local w,h=1.6,0.2
-  if dmx==0 then 
-    w,h=0.2,1.6
-  else
-    dmy = 0
-  end
-  rectx,recty=dmx*(0.4>>>dmx),dmy*(0.4>>>dmy)
-
-  if (player.rope:collide_mrect(mx0+rectx,my0+recty,w,h,exclude_src,exclude_dst)) return false
+  local w,h=1.2,0.2
+  if (dmx==0) w,h=0.2,1.2
+  if (player.rope:collide_mrect(mx0+ropecheck[dmx+2],my0+ropecheck[dmy+2],w,h,exclude_src,exclude_dst)) return false
 end
 
 return true
@ -960,37 +963,36 @@ function rope:draw(artificial_px,artificial_py)
 end

 -- debug
- --[[
 local n1=self.src
 local sy=0
 while true do
  if (n1==nil) break
  local x=n1.ax*8
  local y=n1.ay*8
-  if n1.associated_with then
-   if (n1.associated_with.adx>0) x-=1
-   if (n1.associated_with.ady>0) y-=1
+  local real_anch = level:anchor_for(n1)
+  if real_anch then
+   if (real_anch.adx>0) x-=1
+   if (real_anch.ady>0) y-=1
  end
  rectfill(x-1,y-1,x+1,y+1,12)
-  print("ax="..n1.ax..",ay="..n1.ay,0,sy)
+  print("ax="..n1.ax..",ay="..n1.ay,72,sy)
  sy+=7

  local n0=n1.prev
  local n2=n1.next
  if n0!=nil and n2!=nil then
-   if n1.associated_with then
-    local _,_,_,adx,ady=would_stick(n0.ax,n0.ay,n1.associated_with,n2.ax,n2.ay)
+   if real_anch then
+    local _,_,_,adx,ady=would_stick(real_anch,n0.ax,n0.ay,n1.ax,n1.ay,n2.ax,n2.ay)
    assert(adx==-1 or adx==0 or adx==1)
    assert(ady==-1 or ady==0 or ady==1)
    --assert(not (adx==0 and ady==0))

    local c=3
-    if (n1.associated_with.dropped) c=4
    rectfill(x+2,y+2,x+4,y+4,c)
    pset(x+adx*2,y,9)
    pset(x,y+ady*2,9)
   else
-   rectfill(x+2,y+2,x+4,y+4,2)
+    rectfill(x+2,y+2,x+4,y+4,2)
   end
  else
   rectfill(x+2,y+2,x+4,y+4,4)
@ -1007,7 +1009,6 @@ function rope:draw(artificial_px,artificial_py)
 	 pset(x+p.adx,y,11)
 	 pset(x,y+p.ady,11)
 	end
- ]]--
 end

 function rope:drag_dst(x,y)
@ -1048,21 +1049,17 @@ function rope:relax()
  local n2=n1.next
  if (n2==nil) return

-  if n1.associated_with!=nil then
-
+  
+  if n0 and n2 then
+   local real_anch = level:anchor_for(n1)
   local x0,y0=n0.ax,n0.ay
   local x1,y1=n1.ax,n1.ay
   local x2,y2=n2.ax,n2.ay

-   if x1!=n1.associated_with.ax or y1!=n1.associated_with.ay then
-    -- printh("dragging home: "..tostring{n1.ax,n1.ay}.."->"..tostring(n1.associated_with))
-    self:_drag(n1,n1.associated_with.ax,n1.associated_with.ay)
-   end
-
-   local would,x1_new,y1_new=would_stick(x0,y0,n1.associated_with,x2,y2)
-   if not would and not (n1.ax==x1_new and n1.ay==y1_new) then
-    -- printh("relaxing: "..tostring(n0.associated_with).."->"..tostring(n1.associated_with).."->"..tostring(n2.associated_with))
-    self:_drag(n1,x1_new,y1_new)
+   local would,x1_new,y1_new=would_stick(real_anch,x0,y0,x1,y1,x2,y2)
+   if not would then
+    printh("dragging: "..tostring{real_anch,{n1.ax,n1.ay},{x1_new, y1_new}})
+    self:_drag(n1,x1_new,y1_new,n1.ax,n1.ay)
    n0=n1.prev
    n2=n1.next
    n0.next=n2
@ -1142,19 +1139,14 @@ function rope:_check_sane()
 return true
 end

-function would_stick(x0,y0,anchor,x2,y2)
- local x1,y1=anchor.ax,anchor.ay
+function would_stick(anchor,x0,y0,x1,y1,x2,y2)
+ if (anchor) x1,y1=anchor.ax,anchor.ay

 local dx=x2-x0
 local dy=y2-y0

- -- there is no reason for an acute angle to stick around in this world
- --[[
- local ang0=atan2(x2-x1,y2-y1)
- local ang2=atan2(x0-x1,y0-y1)
- local diff=abs((ang0-ang2 + 0.5)%1-0.5)
- if (diff<0.25) return false,x0,y0,0,0
- ]]--
+ if (x1==x0 and y1==y0) return false
+ if (x1==x2 and y1==y2) return false

 local adx,ady
 local x1_new,y1_new
@ -1176,7 +1168,7 @@ function would_stick(x0,y0,anchor,x2,y2)
  if (x0<x2) ady=-adx
 end

- local wouldnt=anchor.dropped or (anchor.adx!=adx or anchor.ady!=ady)
+ local wouldnt=anchor==nil or (anchor.adx!=adx or anchor.ady!=ady)

 return not wouldnt,x1_new,y1_new,adx,ady
 end
@ -1191,44 +1183,53 @@ function rope:be_pushed_by(anchor,ax_old,ay_old)
  local nx0,ny0=n0.ax,n0.ay
  local nx1,ny1=n1.ax,n1.ay

+  local nxmn,nxmx = _mnmx(nx0,nx1)
+  local nymn,nymx = _mnmx(ny0,ny1)
+  -- printh(tostring({anchor,nxmn,nxmx,nymn,nymx}))
+
  if
-   (ax_new==ax_old and nx0<=anchor.ax and anchor.ax<=nx1) and 
-   (ay_new==ay_old and ny0<=anchor.ay and anchor.ay<=ny1) and 
-   not (anchor.ax==nx0 and anchor.ay==ny0) and
-   not (anchor.ax==nx1 and anchor.ay==ny1) and
+   (ax_new!=ax_old or (nxmn<=anchor.ax and anchor.ax<=nxmx)) and 
+   (ay_new!=ay_old or (nymn<=anchor.ay and anchor.ay<=nymx)) and 

   (_which_side(ax_old,ay_old,nx0,ny0,nx1,ny1)!= 
    _which_side(ax_new,ay_new,nx0,ny0,nx1,ny1) 
-   ) and would_stick(nx0,ny0,anchor,nx1,ny1)
+   ) and would_stick(anchor,nx0,ny0,ax_old,ay_old,nx1,ny1)
  then
+   -- printh("found (in): "..tostring({{nx0,ny0},{nx1,ny1}, anchor}))
   local nx05,ny05
   if ax_new==ax_old then
    nx05=anchor.ax
    ny05=ny0+(nx05-nx0)/(nx1-nx0) * (ny1-ny0)
-    --printh("found (x): "..tostring({nx05,ny05}))
+    -- printh("found (x): "..tostring({nx05,ny05}))
   elseif ay_new==ay_old then
    ny05=anchor.ay
    nx05=nx0+(ny05-ny0)/(ny1-ny0) * (nx1-nx0)
-    --printh("found (y): "..tostring({nx05,ny05}))
+    -- printh("found (y): "..tostring({nx05,ny05}))
   else
    assert(false,"wtf?")
   end

-   local n05={ax=nx05,ay=ny05,associated_with=anchor,prev=n0,next=n1}
+   local n05={ax=nx05,ay=ny05,prev=n0,next=n1}
   --printh("adding: "..tostring({nx05,ny05,anchor}))
   n0.next=n05
   n1.prev=n05
   self:_drag(n05,anchor.ax,anchor.ay)
   -- printh("dragged: "..tostring({n05.ax,n05.ay,anchor}))
-   -- printh("local: "..tostring(n0.associated_with).."->"..tostring(n05.associated_with).."->"..tostring(n1.associated_with))
+   -- printh("local: "..tostring(n0.TODO).."->"..tostring(n05.TODO).."->"..tostring(n1.TODO))
  else
   n0=n0.next
  end
 end
 end

-function rope:_drag(n1,ax1_new,ay1_new)
- local function _sweep_radar(ax_pivot,ay_pivot,ax_far0,ay_far0,ax_far1,ay_far1)
+function rope:_drag(n1,ax1_new,ay1_new,ax_removing,ay_removing)
+ local function _sweep_radar(ax_lhs,ay_lhs,ax_rhs,ay_rhs,ax_pivot,ay_pivot,ax_far0,ay_far0,ax_far1,ay_far1)
+  local function _uncreatable(anchor)
+   return (anchor.ax==ax_lhs and anchor.ay==ay_lhs) or
+    (anchor.ax==ax_rhs and anchor.ay==ay_rhs) or
+    (anchor.ax==ax_removing and anchor.ay==ay_removing)
+  end
+
  if (ax_far0==ax_far1 and ay_far0==ay_far1) return nil

  if ax_far0==ax_far1 then
@ -1239,11 +1240,9 @@ function rope:_drag(n1,ax1_new,ay1_new)
   for ay_far_new in _stepfrom(ay_far0,ay_far1) do
    for anchor in level:anchor_points() do
     if 
-      not (anchor.ax==ax_pivot and anchor.ay==ay_pivot) and
-      -- not (anchor.ax==ax_far0 and anchor.ay==ay_far0) and
-      not (anchor.ax==ax_far1 and anchor.ay==ay_far1) and
+      not _uncreatable(anchor) and
      (ax0<=anchor.ax and anchor.ax<=ax1) and 
-      would_stick(ax_pivot,ay_pivot,anchor,ax_far,ay_far_new) and
+      would_stick(anchor,ax_pivot,ay_pivot,nil,nil,ax_far,ay_far_new) and
      (
        _which_side(anchor.ax,anchor.ay,ax_pivot,ay_pivot,ax_far,ay_far_old) !=
        _which_side(anchor.ax,anchor.ay,ax_pivot,ay_pivot,ax_far,ay_far_new)
@ -1262,11 +1261,9 @@ function rope:_drag(n1,ax1_new,ay1_new)
   for ax_far_new in _stepfrom(ax_far0,ax_far1) do
    for anchor in level:anchor_points() do
     if 
-      not (anchor.ax==ax_pivot and anchor.ay==ay_pivot) and
-      -- not (anchor.ax==ax_far0 and anchor.ay==ay_far0) and
-      not (anchor.ax==ax_far1 and anchor.ay==ay_far1) and
-      would_stick(ax_pivot,ay_pivot,anchor,ax_far_new,ay_far) and
+      not _uncreatable(anchor) and
      (ay0<=anchor.ay and anchor.ay<=ay1) and 
+      would_stick(anchor,ax_pivot,ay_pivot,nil,nil,ax_far_new,ay_far) and
      (
        _which_side(anchor.ax,anchor.ay,ax_pivot,ay_pivot,ax_far_old,ay_far) !=
        _which_side(anchor.ax,anchor.ay,ax_pivot,ay_pivot,ax_far_new,ay_far)
@ -1287,10 +1284,13 @@ function rope:_drag(n1,ax1_new,ay1_new)
 local n0=n1.prev
 while true do
  if (n0==nil) break
-  local anch=_sweep_radar(n0.ax,n0.ay,ax1_old,ay1_old,ax1_new,ay1_new)
+  local anch=_sweep_radar(
+   n0.ax,n0.ay,n1.ax,n1.ay,
+   n0.ax,n0.ay,ax1_old,ay1_old,ax1_new,ay1_new
+   )
  if (anch==nil) break
-  local n05={ax=anch.ax,ay=anch.ay,associated_with=anch,prev=n0,next=n1}
-  -- printh("creating pre: "..tostring(n0.associated_with).."->"..tostring(n05.associated_with).."->"..tostring(n1.associated_with))
+  local n05={ax=anch.ax,ay=anch.ay,prev=n0,next=n1}
+  -- printh("creating pre: "..tostring(n0.TODO).."->"..tostring(n05.TODO).."->"..tostring(n1.TODO))
  n0.next=n05
  n1.prev=n05
  n0=n05
@ -1299,10 +1299,13 @@ function rope:_drag(n1,ax1_new,ay1_new)
 local n2=n1.next
 while true do
  if (n2==nil) break
-  local anch=_sweep_radar(n2.ax,n2.ay,ax1_old,ay1_old,ax1_new,ay1_new)
+  local anch=_sweep_radar(
+   n1.ax,n1.ay,n2.ax,n2.ay,
+   n2.ax,n2.ay,ax1_old,ay1_old,ax1_new,ay1_new
+  )
  if (anch==nil) break
-  local n15={ax=anch.ax,ay=anch.ay,associated_with=anch,prev=n1,next=n2}
-  -- printh("creating post: "..tostring(n1.associated_with).."->"..tostring(n15.associated_with).."->"..tostring(n2.associated_with))
+  local n15={ax=anch.ax,ay=anch.ay,prev=n1,next=n2}
+  -- printh("creating post: "..tostring(n1.TODO).."->"..tostring(n15.TODO).."->"..tostring(n2.TODO))
  n1.next=n15
  n2.prev=n15
  n2=n15
@ -1588,7 +1591,7 @@ function rope:_anchors_simplified()
   x=flr(a.ax*8+0.5),y=flr(a.ay*8+0.5),
   ax=a.ax,ay=a.ay
  }
-  local aw=a.associated_with
+  local aw=level:anchor_for(a)
  local l=self.latch
  if aw then
   if (aw.adx==1) point.x-=1
@ -1867,64 +1870,64 @@ __map__
 0c00000000001c00000000000000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0e0000000000000000000000000000000e000000000000000000000000000000
 0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e
 __sfx__
-01280000050550c05511055180551d05500000000000000000055070550c0550f055130550f0550c0550705501055080550d055140551905500000000000000000055070550f0551305518055130550f0550c055
-0128000000000000001f0001f055200551f0551d055180551b055000000000000000000000000000000000000000000000000001b0551d0551b05519055140551805500000000000000000000000000000000000
-01280000050550c05511055180551d05518055110550d0550c055130551b055240552b0551b05518055130550a055110551a05522055290550e0550a05505055000550705510055180551f055100550c05507055
-012800000000000000130001f055220552005500000270551f0550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-012800001d4521d452050550c05514055110551f452204522445224452050550c055140551105526452264522745227452080550f055180551405526452244522245222452030550a0551f4521f4521b4521b452
-012800001d4521d4520105508055110550d0551f452204522445224452050550c055140551105526452264522745227452070550e0551f4521f4522645226452244522445200055070550f0520f0550e0550c055
-00280000000000000000000000000505500000050550c055000000000000000050050505500000050550c055000000000000000000000805500000080550f05500000000000000000000030550a0550205509055
-012800000122401222000000000001055000000105508055052220522200000000000505500000050550c05507222072220000000000022220222202222022220022200222000000000000055070550005507055
-012800001d3541f3542035420300203040000027354273501f350000001d3001d3541b354000001f354000001d3541f3542035422354243542635027354293502b3540000024354000002935429350293502b350
-012800000000000000010550805501055080050105508055000550800000000070550005507055000550705500000000000105508055010550805501055080550005500000070550000000055000000705500000
-01280010183541a3541b3540000000000000002235400000213540000026354000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-01281000080050f005080550f05501055000000f055000000e3550000013355000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00110000250002500025030250302503000000230350000023030230302303023030230302303023030230302103021030210302103021030210300000000000177401774017740177311e7501e7501e7501e750
+00110000290202a0212a0202a0202a0202a02025030250052503025030250302503025030250302503025030250302503025030250302503225030230322504526030260302a040000002d0402d0402d0402d040
+001100001e7401e7401e7401e74010730107301073010730157301573015730157301573015730157301573015730157301573015730000000000000000000000000000000000000000019030190300000000000
+001100002d0422d0402a0302a0302c0302c0302c0322c0322d0402d0312d0302d0302d0302d0302d0302d0302d0302d0302d0322d03200000000000000000000000000000000000000002b0402c0410000000000
+001100001274012740127401274012740127401274012740177301773017730177301773017730177301773014730147301474014740107401074010740000001573015730157301573009720097300973009730
+001100002a0402a0412a0412a0402a0402a0402a042290412a0412a0402a0402a0402a0402a0402a0422903128041280402804028040280402804226032000002504025040250402603026030260322803200000
+001100000e0300e0300e0300e0300e0300e0300000000000000000000000000000000000000000150301503014030140301403014030120301203012030120300d0200d0200d0200d0200d0200d0200d0200d020
+001100002804028040280402804028040280402104000000210402104021040210402104021040150001500014000140001400014000120001200012000240342503125030250302503025030250322503225032
+00110000150301503015030150301503015030150301503015030150301503015030150301503015030150300b0200b0200b0200b0200b0200b0200b0200b0200b0200b0200b0200b02000000000000000000000
+001100002501425010250102501025010250102501025010250212502025020250202502125020250202502027540275402754027540275402754027540275402703027030270302703027030270302703027030
+001100002312023120231202312023120231202312023120231202312023120231202312023120231202212123141231402314023140231402314021140201401e1401e1401e1401e1401c140001001e14020140
+00110000000000000006322063250d3320d33209320093200932009325093200932509320000001703017030170300b0200b0200b0200b02017030170300b0301403014030140301403514030140300000014330
+0011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001b0301b0301b030000001b0301b0301b030000001b0301b0301b03000000
+0011000020140201402013020130201302013020130201301d1401e1411e1401e1401c140002001b2401b2401b240000000000022554235512355023550235402354023540235402354023540235402314023140
+0011000000000150301503000000000000e0300e0300e0300e0320e0320e0320e0320e0300e0300e030000000d0300d0300d0300d0300d0300d0300d0300d0300d0300d0300d0300d0300d0300d0300d0300d030
+00110000190331903019030000001a0331a0301a0301a0301a0301a0301a0301a0301a0301a0301a0300000027320273202732027320000000000027320273202732027320273202732000000000000000000000
+00110000211402d1402d145000002a1302a1302a1302a1302a1322a1322a1322a1322a1322a13000100000002c3202c3202d3202d3202f320003002d3302d3302d3302d3302c3312c3302a3302a3302833000000
+001100000b0300b0300b0000b0000b0300b0300b0300b0300b0300b0300b0300b0300b0300b0300b0300000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+001100002704027040000000000027040270402704027040270402704027040270402704027040000000000028020280202a020000002c030000002a0202a02000000000002c0302c0302c0302c0300000000000
+001100002a3302a3302c330003002a3302a3302a3302a3302a3302a3322a3322a3322a3322a332283322a3322c3302c3302d330003002f3302f3052d3302d33000300003002f3302f3302f3302f3302804028045
+00110000000000000015310153101531015310153101531000000000001032010320103201032010320103200e3200e3200e3200e3200e3200e3200e3200e32000000000000d3200d3200d3200d3200d3200d320
+001100003102031022310223102231022310222f0322d0302c030000002a0400000028030000002603026030260302603026030260302603026030000000000029040000002a040000002c040000002d0502d050
+0111000034040340403404034042340423404232042310422f040000002d040000002c040000002a0402a0402a0402a0402a0422a0422a0422a042290402a0402c040000002d040000002f040000003104031040
+001100001203012030120351230010030100301003010030020200202002020020200202002020020200202002020020200202002020020220202202022020220b0400b040000000000010040100400000000000
+0011000000000000002c0402c04000000000002a0302a0302a0302a0302a0302a0302a0302a0302a0302a0302a0302a0302a0302a0302a0302a0302a030000002604026040000000000028040280400000000000
+0011000000000000002f0402f04000000000002d0402d0402d0422d0422d0422d0422d0422d0422d0402d0402d0402d0402d0402d0402d0402d0402d040000002a0402a04000000000002c0302c0300000000000
+001100000932209322093220932209322093220932209322043220432204322043220432204322023220232202322023220232202322023120231204312023120131000000033100000005310000000632006320
+00110000250402504025040250402504025040230402104020040000001e040000001c040000001a0401a0401a0401a0401a0401a0401a0400000000000000000000000000000000000000000000000000000000
+0011000028030280302803028030280302803026030250402304000000210400000020040000001e0401e0401e0401e0401e0401e0401e040000001d0401e0402004000000210400000023040000002504025040
+00110000063200632012310123100431004310103101031002310023100231002310023150200002745017450b7351770017735060001274506000107550400004000107550b7550400004755010000172001722
+00110000250502505023040230402304023040250402303021050210502105221050210502105021050210502a030000002d030000003203000000310403104031040310402f0302d0402f0502f0502d0402c040
+001100000e7450e7050000012745000000070010740107401074210742107421074210740000000e7400e7400d7450d00500000117450000000000127401274012742127421e7421e7421c7401c7451074010745
+001100002a05512005000003205500000000002f0502f0502f0502f0502f0502f0502f050000002c0402a0502905500000000003105500000000002d0402d0402d0402d0402d0402d0402c0402c0402c0402c040
+001100000e0400e0400e0400e0400e0400e0400d040000000b0400b0400b0400b0400b0400b040020400000004040040400404004040040400404504040000000404004040040300400001000010000104001030
+001100002a0402a0402a0402a0400000000000260302503023030230302303023030320503205232052320523104031040310403104031040310402f040000002f0402f0402f0402f0002a0402c0402a04028040
+001100001731517310173151731517020170251033010330103301033010330103300233002325023300232501330013300133501335013300133506330063300633006330063300633004040040400404004040
+00110000173601733023030233300b6630b3352a66317330173302a6532c230282302c230282302a6531a230190301903025030250330b6650b6702a6231e0302a7001e7302a6231e730287301c7302a6231c730
+001100002634026340263403234032340323402f3402f3402f3422f3422f3422f3422f3422f34228342263402533025330253303135031350313502d3402d3402d3422d3422d3422b3412c3412c3422c34229341
+001100000e7300e7300e7300e7300e7300e7300d7300d7300b7400b7400b7400e7400e7400e740100401004010030100300403004030040300403004030040300403004030040300403004030040300403000000
+00110000260301a030260301a030260301a03000000000002304017040230402603017030260302a0401c0402a0401c0402a0401c0402a0401c0402a0401c040280401c040280401c04028040000001c04000000
+00110000293402a3412a3422a3422a3422a34228350000002634026340263403234032340323402f3502f3502f3522f3522f3522f3422f3422f3422f3422f3422f3422f3422f3422f3422f340000002d3402d345
+001100001004010040100401004010040100401004010040100301003010030100301003010030100301003010020100201000010000100051000010000100000000000000000000000000000000000000000000
+001100002604028040260302803026040280402603028030260202802026020280202601028010260102801025010250152500028000250052800025000340000d5100d0300d0300000000000125140603006030
+001100002d3322d3322d3322d3322d3322d3322d3322d3322d3222d3222d3222d3222d3222d3222d3222d3222d4122d4122d4022d4052d4002d4002d400000003843038430384303843500000000003473034730
+001100000601006015000000000000000000000000000000215401a030210400000000000000001c540150301c0400000000000000001e540170301e040000000000000000195401203019040120300d0350d005
+0011000034720347203472034720347250000000000001003173031730317302f7352d735001002c7402c7402c7402d7452f745007002d7502d7502d7502c7452a74500700287402874028740007002574500100
+001100001a0302a0321a0301a0351a0001a00000000000000000000000000000000000000000000000000000000000000000000000002f0401c0222f04000000000001c0202d0422502019040190401904019040
+00110000217302173021710217102171021715217002170021000210002100021000210002100021000210000000000000000001c700387303873038730387300000000000347303473034730347303473034730
+0111000025020250202d0402c0402a140022150e0251202012020151250d2152502019020280351a030230251702026030260301703023030200001c000200301c02023040040200402004020040200000000000
+001100003403034030317302f7302d7302d7302d7202f72031720001002f7402f7402f740007002d740007002a7502a75032750327502f7402f7402f7402f7422f7422f7422f7422f74500700007001c75000700
+00110000253401c34009360093600936009340093401734004340043400434004340043401734002340023400234002340023401a340023400434002340023400134000300033400030005340003000635006350
+001100001c567285303453034540345403454032540315402f540255402d540255402c540255402a5402a5402a5402a54021540215402154021540295302a5302c540235402d540255402f540255403155031550
+00110000000000000000000000000000000000000000000021440204401e4401e4401e4401e4401e4401e4401a44000000174401a000174401a00012440124401224012240102401024010240102400d0000d000
+001100000635006350123401234004350043501034010340023400234002340023400234002340023400234017340230001a3402a0001a340000002d3402d3402d3402d3402c3402a3402c3402c3402d0352c035
+0011000031560255602f5602f5602f56025560315602f5602d5602f5602d5602d5602d5602d5602d5602c5601e16000100211500000026130000002514025140251402514023130211402315023155201001e100
+011100002804026040280402604028030260302803026030280302603028030260302802026020280202602028020250202802025020280102501028010250102801025010280102501028010250102802025020
+001120002d3202d3202d3202d3202d3202d3202d3202d3202d3202d3202d3202d3202d3202d3202d3202d3202d3112d3102d3102d3102d3102d3102d310014000140001400014000140001400014000140001400
+0111000034530345323453234532345323453232532315302f540005002d540005002c540005002a5402a5402a5402a5402a5402a5402a5402a540295402a5402c540005002d540005002f540001003104031040
 001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
@ -1932,10 +1935,32 @@ __sfx__
 001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 010300000015000250000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 __music__
-01 00014344
-00 02034344
-00 04064344
-00 05074344
-00 08094344
-02 0a0b4344
-
+01 00014140
+00 02034340
+00 04054540
+00 06074740
+00 08090a40
+00 0b0c0d40
+00 0e0f1040
+00 11121340
+00 14151640
+00 17181940
+00 1a1b1c40
+00 1d1e5e40
+00 1f206040
+00 21226240
+00 23242540
+00 26272840
+00 292a2b40
+00 2c2d6d40
+00 2e2f6f40
+00 30317140
+00 14153940
+00 17181940
+00 32335472
+00 34353640
+00 1f204040
+00 21224040
+00 23242561
+00 26272840
+02 37387840
Author	SHA1	Message	Date
Nyeogmi	84605fea37	Simplified anchors (broken)	2022-12-29 15:16:19 -08:00
Nyeogmi	8393b9d2f2	Fix more known rope bugs	2022-12-29 14:54:08 -08:00
Nyeogmi	a1f9617842	Fix can_move constants to remove path dependence	2022-12-28 13:23:34 -08:00
Kistaro Windrider	812d619cc7	can_move golf, redux (#14 ) previous attempt tried to use shifts to get 0.4 to 0.2 or 0.8 and multiplication to get -0.8, forgetting that the multiplication would also turn 0.4 into 0 along the way. oops. I got ratholed on the mathematical approach, but a very straightforward lookup table can get more done. Reviewed-on: pyrex/chameleonic#14 Co-authored-by: Kistaro Windrider <kistaro@gmail.com> Co-committed-by: Kistaro Windrider <kistaro@gmail.com>	2022-12-28 21:12:23 +00:00
Nyeogmi	ad9d53887e	Revert one broken golf attempt	2022-12-23 17:33:06 -08:00
Nyeogmi	9438597312	Save a few more tokens by removing an assertion	2022-12-23 16:09:57 -08:00
Kistaro Windrider	c480295b41	Save some tokens in horrible, horrible ways. (#13 ) replace comparisons with bit math bullshit integers in the range [0, 15] fit entirely in the bit mask 0x000F. integers out of that range will have at least one bit 0x0010 or higher, or will have the sign bit 0x8000 set. so to find out if one of two numbers is out of range [0, 15], we can check the bit mask of their bitwise or. this saves tokens and cycles. it is also completely illegible. very in the spirit of Pico-8, I love it. comment the bullshit it needs it packed crate representation don't bother exploding crates into four bools, and then comparing them all individually to a bunch of conditions. absurd bit manipulation bullshit saves cycles and tokens. leaving a crate's movement rule represented as four bits means we can exploit our previous calculation of dx1 and dy1, which must each either be 0x0001 or 0x8FFF, and violently hammer them down to align with this bit-packed representation, giving this glorious little atrocity. Fix crate math. I forgot that -1 & 1 = 1 rather than 0 so all the bit math didn't work. But I can fix it with polynomial algebra! this is much better. Save tokens on movemebnt checks I promise this is mathematically equivalent-ish to the original. (0.2 and its multiples are nonterminating decimals in base 2, so there's a little jank when the negative shift right is a shift left.) Trimming Trim up redundant nil checks, sequential assignments that could be on a shared line, and repeated references to a deeply nested variable. Reviewed-on: pyrex/chameleonic#13 Co-authored-by: Kistaro Windrider <kistaro@gmail.com> Co-committed-by: Kistaro Windrider <kistaro@gmail.com>	2022-12-24 00:08:10 +00:00
Nyeogmi	8f65f884f2	Less annoying music	2022-12-23 16:05:38 -08:00