Slightly more efficient fix to level_tug_crate.

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.

chameleonic.p8

@@ -8,8 +8,9 @@ real_modules={}
 frame=0
 function _init()
  -- printh("restarting")
- music_on()
+ _doall("init")
- _doall("init") end
+end
+
 function _update()
  frame+=1
  if (frame%1==0) _doall("update") end
@@ -17,12 +18,16 @@ function _draw()
  _doall("draw") end
 
 function music_on()
- music(0)
+ if (stat(54) ~= 0) music(0)
+ persist.music=true
+ persist:write()
  menuitem(3, "music: on", music_off)
 end
 
 function music_off()
  music(-1)
+ persist.music=false
+ persist:write()
  menuitem(3, "music: off", music_on)
 end
 
@@ -261,7 +266,7 @@ end
 title={}
 add(modules,title)
 
-blinkcol=10
+lvlshimmer = {4,9,10,10,9}
 function title:draw()
  cls(0)
  -- this is right for 72x32
@@ -270,22 +275,33 @@ function title:draw()
  print("[nyeogmi]",62,73,7)
  print("kistaro",32,79,7)
  local lvlstr = "⬅️ "..start_level.." ➡️"
- print(lvlstr,50,91,1)
+ local lx, ly = 51+wrongbleep:vibrate(), 90+wrongbleep:vibrate()
- print(lvlstr,51,90,blinkcol) 
+ print(lvlstr,lx-1,ly+1,1)
+ print(lvlstr,lx,ly,cycle(lvlshimmer)) 
 end
 
-start_level=0
+function title:init()
-max_level=31
+ start_level=persist.recent_level
+ -- max_level=persist.max_level
+ max_level = 31 --debugging/coding
+ wiped = false
+end
 
 function title:update()
- blinkcol=9
- if (time()*4\1%2==0) blinkcol=10
- 
  if (btnp"0") start_level-=1
  if (btnp"1") start_level+=1
- start_level%=max_level
+ start_level%=(max_level+1)
-
+ if btn"3" and not wiped then
- if (btnp"4" or btnp"5") modules=real_modules _init() music(0)
+  wrongbleep:bleep()
+  if (wrongbleep:adequately_warned()) then
+   persist:wipe()
+   max_level = 0
+   start_level = 0
+   wiped=true
+   -- todo: sfx(kaboom!)
+  end
+ end
+ if (btnp"4" or btnp"5") modules=real_modules _init()
 end
 
 -->8
@@ -308,6 +324,8 @@ function level:reinit(n)
  self:load_dynobjs()
  self:recollide_reanchor()
  self:spawn_exit()
+ 
+ persist:lvlstart()
 end
 
 function level:restart()
@@ -615,10 +633,12 @@ end
 
 ropecheck=split"-0.6,0.4,0.4"
 
+-- argument "o" is a rope operation:
+-- array of [mx0,my0,dmx,dmy]
 function level:can_move(
- is_player,
+ is_player,o,exclude_src,exclude_dst
- mx0,my0,dmx,dmy,exclude_src,exclude_dst
 )
+ local mx0,my0,dmx,dmy=unpack(o)
  local mx1,my1=mx0+dmx,my0+dmy
  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()
@@ -634,7 +654,12 @@ function level:can_move(
  return true
 end
 
-function level:tug_crate(mx0,my0,dmx,dmy)
+-- 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,mx0,my0,dmx,dmy=level,unpack(t)
  local mxy0=_mix{mx0,my0}
  local existing=self._crates[mxy0]
  if (not existing) return
@@ -716,7 +741,7 @@ function player:update()
   else
    local x,y=self.x,self.y
    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.cooldown=3
      local t=f[#f]
@@ -976,7 +1001,7 @@ function rope:affected_src_xy(artificial_px,artificial_py)
 end
 
 function rope:draw(artificial_px,artificial_py)
- local points,highlight,hypo_ops=self:_tug(true)
+ local points,highlight,hypo_ops,hypo_blocks=self:_tug(true)
  local n,perc_to_show,from_end = self.state.name,1.0
  if (n=="done") return
  if (n=="cast") perc_to_show=self.state.frame/2
@@ -1048,13 +1073,19 @@ function rope:draw(artificial_px,artificial_py)
 
  -- hypothetical
  local time=t()-self.flicker_t
- if n=="latched" and time>0 and time%0.5>0.25 and not level:busy() then
+ if n=="latched" and time>0 and not level:busy() then
+  if time%0.5>0.25 then
    for o in all(hypo_ops) do
     local mx0,my0,dmx,dmy=unpack(o)
     local px1,py1=(mx0+dmx)*8,(my0+dmy)*8
     spr(14,px1,py1)
    end
   end
+  for o in all(hypo_blocks) do
+   local x,y,dx,dy=unpack(o)
+   spr(53,8*x+4*dx,8*y+4*dy,1,1,time%0.5>0.25)
+  end
+ end
 
  -- debug
  --[[
@@ -1513,29 +1544,29 @@ function rope:_tug(hypothetically)
  local ancs=self:_anchors_simplified()
  local touched={}
 
+ local blocks = {}
  for i=#ancs-1,2,-1 do
-  local ops_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_to_do,corners={}
+  local ops = {}
+  for b in all(blocks_before_trash) do add(blocks, b) end
   if #ops_before_trash>0 then 
-   ops_to_do=ops_before_trash 
+   ops=ops_before_trash
   else 
-   local ops_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_to_do=ops_after_trash
+   ops=ops_after_trash
+   for b in all(blocks_after_trash) do add(blocks,b) end
   end
 
-  local ops=ops_to_do
-
   if #ops>0 then
-   if (hypothetically) return ancs,i-1,ops
+   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
   end
  end
 
  local latch=self.latch
  if latch and latch.el=="eyehook" then
-  if (hypothetically) return ancs,0,{}
+  if (hypothetically) return ancs,0,{},blocks
   player.todo={{
    update=function(s) 
     if not s.rope or s.rope:done() then
@@ -1576,17 +1607,20 @@ function rope:_tug(hypothetically)
    invalid_move=true
   end
   
-  if not invalid_move and
+  if not invalid_move then
-   level:can_move(false,mx0,my0,dmx,dmy,1,0)
+   local mv = {mx0,my0,dmx,dmy}
-  then
+   if level:can_move(false,mv,1,0) then
-   if (hypothetically) return ancs,0,{{mx0,my0,dmx,dmy}}
+    if (hypothetically) return ancs,0,{mv},blocks
 
-   level:tug_crate(mx0,my0,dmx,dmy) 
+    level_tug_crate(mv) 
     return true
+   else
+    add(blocks, mv)
+   end
   end
  end
 
- if (hypothetically) return ancs
+ if (hypothetically) return ancs,0,{},blocks
  return 
 end
 
@@ -1611,21 +1645,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
+   ax0, dmx=ax0-1,-1
-   dmx=-1
+  elseif anch.adx!=1 or a0.x>=an.x-7 then
-  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,{mx,my,dmx,0})
+   add(ops,{ax0,my,dmx,0})
   end
  end
  
@@ -1637,43 +1666,32 @@ 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
+   ay0,dmy=ay0-1,-1
-   dmy=-1
+  elseif anch.ady!=1 or a0.y>=an.y-6 then
-   
-  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,my,0,dmy})
+   add(ops,{mx,ay0,0,dmy})
   end
  end
 
- local ops2={}
+ local ops2,blocked={},{}
  for o in all(ops) do
-  local mx,my,dmx,dmy=unpack(o)
+  local mx,my=unpack(o)
-  if not level:mcoll(mx,my) then
+  if level:mcoll(mx,my) then
-   -- great!
+   if (not level:get_crate(mx, my)) break
-  else
+   if not level:can_move(false,o,0,0) then
-   local crate=level:get_crate(mx,my)
+    add(blocked,o)
-   if crate then
-    if not level:can_move(false,mx,my,dmx,dmy,0,0) then
-     break
-    end
-   else
     break
    end
    add(ops2,o)
   end
  end
- return ops2
+ return ops2,blocked
 end
 
 function rope:_anchors_simplified()
@@ -1715,6 +1733,7 @@ end
 -->8
 --wrongbleeps
 wrongbleep={}
+add(modules,wrongbleep)
 add(real_modules,wrongbleep)
 function wrongbleep:init()
  self.duration=0
@@ -1722,8 +1741,12 @@ function wrongbleep:init()
 end
 function wrongbleep:update()
  if (self.duration>5) self.duration=5
- if self.duration>0 then sfx(63,3) self.continuous+=1
+ if self.duration>0 then
- else self.continuous=0 end
+  sfx(63,3)
+  self.continuous+=1
+ else
+  self.continuous=0
+ end
  self.duration=max(self.duration-1,-4)
 end
 function wrongbleep:bleep(duration)
@@ -1881,6 +1904,48 @@ function debugmouse:draw3()
  pal()
 end
 
+-->8
+-- save/load
+
+persist={}
+add(modules, persist)
+add(real_modules, persist)
+
+function persist:init0()
+ cartdata("ulimate_lizard_total_destruction_0_1")
+ self.init0 = self.read
+ self:read()
+end
+
+function persist:read()
+ self.ready=false
+ local m = dget(0) == 0
+ self.music = m
+ if m then music_on() else music_off() end
+ self.max_level = dget(1)
+ self.recent_level = dget(2)
+ self.ready=true
+end
+
+function persist:wipe()
+ for i=0,64 do
+  dset(i,0)
+ end
+ self:read()
+end
+
+function persist:lvlstart()
+ self.recent_level = level.ix
+ self.max_level = max(self.max_level, level.ix)
+ self:write()
+end
+
+function persist:write()
+ if (not self.ready) return
+ dset(0, self.music and 0 or -1)
+ dset(1, self.max_level)
+ dset(2, self.recent_level)
+end
 __gfx__
 000030000000002200003000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeff1ff1ff1fffffff1ffffff1fffffff1dddddddd111111110000000033300333
 003333300000332200333330eeffffffffffffffffffffeee5e555e55e555e5eff1ff1ffffffffffffffffffffffffffdddddddd111111110cc00cc033300333
@@ -1908,10 +1973,10 @@ eeee0000cc04405500444400efeeee5e11111111e5eeeefeeeeeeeeeeeeeeeeeffffffffffffffff
 000aa111991111103bbbbbb3eeeeeeeeeeeeeeeeeeeeeeeeff1ff1ffffffffffffffffff00000000000000000000000000000000000000000000000000000000
 0000000099100000f765000000000000000000000000000000000000000000000000000000000000000000000000000011111111111111111999999111111111
 00000000990000007700000000000000000000000000000000000000000000000000000000000000000000000000000019911991999999911999999119999999
-00000000990000006060000000000000000000000000000000000000000000000000000000000000000000000000000019977991999999911999999119999999
+00000000990000006060000000000000000bc0000090020000000000000000000000000000000000000000000000000019977991999999911999999119999999
-00000000090000005005000000000000000000000000000000000000000000000000000000000000000000000000000019911991999117111991199111711999
+00000000090000005005000000bbcc00000bc0000009200000000000000000000000000000000000000000000000000019911991999117111991199111711999
-00000000aa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000019911991999117111991199111711999
+00000000aa0000000000000000ccbb00000cb0000002900000000000000000000000000000000000000000000000000019911991999117111991199111711999
-0000000077a000000000000000000000000000000000000000000000000000000000000000000000000000000000000019999991999999911997799119999999
+0000000077a000000000000000000000000cb0000020090000000000000000000000000000000000000000000000000019999991999999911997799119999999
 00000007777a00000000000000000000000000000000000000000000000000000000000000000000000000000000000019999991999999911991199119999999
 00044444444444000000000000000000000000000000000000000000000000000000000000000000000000000000000019999991111111111111111111111111
 44444444444004444444444444400444444444444440044444444444444004444444444444400444444444444440044444444444444004444444444444400444
@@ -2141,7 +2206,7 @@ __label__
 77777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777
 
 __gff__
-000000c0c0c0c0c0c0c0c0c0c0c00000000000c0c0c0c0c0c0c0c0c0202020200040c0c0c0c0c0c0c008080800000000404000000808080808080808c0c0c0c000000000080808080808080800000008000000000808080808080808000000000008080808080808080808080000000000080808080808080808080800000000
+000000c0c0c0c0c0c0c0c0c0c0c00000000000c0c0c0c0c0c0c0c0c0202020200040c0c0c0c0c0c0c008080800000000404000000000080808080808c0c0c0c000000000080808080808080800000008000000000808080808080808000000000008080808080808080808080000000000080808080808080808080800000000
 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 __map__
 0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d1203040404050d0d0d0d010d0d0d0d0d0d0d0d0d0d0d0d0d0d120d0d0d0d0d0d0d0d0d0d0d0d0d03043e0a040404050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d