Slightly more efficient fix to level_tug_crate.

Fix syntax errors.
_calc_push golf redux
2023-01-02 16:26:30 -08:00 · 2023-01-02 16:25:18 -08:00 · 2023-01-02 16:22:10 -08:00 · 2023-01-02 16:04:42 -08:00 · 2023-01-02 15:58:23 -08:00 · 2023-01-02 15:57:27 -08:00
1 changed files with 66 additions and 67 deletions
--- a/chameleonic.p8
+++ b/chameleonic.p8
@ -633,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,
- mx0,my0,dmx,dmy,exclude_src,exclude_dst
+ is_player,o,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()
@ -652,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
@ -734,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]
@ -994,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
@ -1066,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
 --[[
@ -1531,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_to_do,corners={}
+  local ops_before_trash,blocks_before_trash=self:_calc_push(ancs[i+1],ancs[i],ancs[i-1],ancs[i-2])
+  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])
-   ops_to_do=ops_after_trash
+   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
+   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
-
-   for o in all(ops) do level:tug_crate(unpack(o)) end
+   if (hypothetically) return ancs,i-1,ops,blocks
+   foreach(ops, level_tug_crate)
   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
@ -1594,17 +1607,20 @@ function rope:_tug(hypothetically)
   invalid_move=true
  end
  
-  if not invalid_move and
-   level:can_move(false,mx0,my0,dmx,dmy,1,0)
-  then
-   if (hypothetically) return ancs,0,{{mx0,my0,dmx,dmy}}
+  if not invalid_move then
+   local mv = {mx0,my0,dmx,dmy}
+   if level:can_move(false,mv,1,0) then
+    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

@ -1629,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
-   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
 
@ -1655,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
-   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={}
+ local ops2,blocked={},{}
 for o in all(ops) do
-  local mx,my,dmx,dmy=unpack(o)
-  if not level:mcoll(mx,my) then
-   -- great!
-  else
-   local crate=level:get_crate(mx,my)
-   if crate then
-    if not level:can_move(false,mx,my,dmx,dmy,0,0) then
-     break
-    end
-   else
+  local mx,my=unpack(o)
+  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
   end
   add(ops2,o)
  end
 end
- return ops2
+ return ops2,blocked
 end

 function rope:_anchors_simplified()
@ -1915,24 +1915,23 @@ function persist:init0()
 cartdata("ulimate_lizard_total_destruction_0_1")
 self.init0 = self.read
 self:read()
- self.ready=true
 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()
- self.ready=false
 for i=0,64 do
  dset(i,0)
 end
 self:read()
- self.ready=true
 end

 function persist:lvlstart()
@ -1974,10 +1973,10 @@ eeee0000cc04405500444400efeeee5e11111111e5eeeefeeeeeeeeeeeeeeeeeffffffffffffffff
 000aa111991111103bbbbbb3eeeeeeeeeeeeeeeeeeeeeeeeff1ff1ffffffffffffffffff00000000000000000000000000000000000000000000000000000000
 0000000099100000f765000000000000000000000000000000000000000000000000000000000000000000000000000011111111111111111999999111111111
 00000000990000007700000000000000000000000000000000000000000000000000000000000000000000000000000019911991999999911999999119999999
-00000000990000006060000000000000000000000000000000000000000000000000000000000000000000000000000019977991999999911999999119999999
-00000000090000005005000000000000000000000000000000000000000000000000000000000000000000000000000019911991999117111991199111711999
-00000000aa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000019911991999117111991199111711999
-0000000077a000000000000000000000000000000000000000000000000000000000000000000000000000000000000019999991999999911997799119999999
+00000000990000006060000000000000000bc0000090020000000000000000000000000000000000000000000000000019977991999999911999999119999999
+00000000090000005005000000bbcc00000bc0000009200000000000000000000000000000000000000000000000000019911991999117111991199111711999
+00000000aa0000000000000000ccbb00000cb0000002900000000000000000000000000000000000000000000000000019911991999117111991199111711999
+0000000077a000000000000000000000000cb0000020090000000000000000000000000000000000000000000000000019999991999999911997799119999999
 00000007777a00000000000000000000000000000000000000000000000000000000000000000000000000000000000019999991999999911991199119999999
 00044444444444000000000000000000000000000000000000000000000000000000000000000000000000000000000019999991111111111111111111111111
 44444444444004444444444444400444444444444440044444444444444004444444444444400444444444444440044444444444444004444444444444400444
@ -2207,7 +2206,7 @@ __label__
 77777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777

 __gff__
-000000c0c0c0c0c0c0c0c0c0c0c00000000000c0c0c0c0c0c0c0c0c0202020200040c0c0c0c0c0c0c008080800000000404000000808080808080808c0c0c0c000000000080808080808080800000008000000000808080808080808000000000008080808080808080808080000000000080808080808080808080800000000
+000000c0c0c0c0c0c0c0c0c0c0c00000000000c0c0c0c0c0c0c0c0c0202020200040c0c0c0c0c0c0c008080800000000404000000000080808080808c0c0c0c000000000080808080808080800000008000000000808080808080808000000000008080808080808080808080000000000080808080808080808080800000000
 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 __map__
 0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d1203040404050d0d0d0d010d0d0d0d0d0d0d0d0d0d0d0d0d0d120d0d0d0d0d0d0d0d0d0d0d0d0d03043e0a040404050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d
Author	SHA1	Message	Date
Kistaro Windrider	a177660344	Slightly more efficient fix to level_tug_crate.	2023-01-02 16:26:30 -08:00
Kistaro Windrider	49284d44a8	Fix syntax errors.	2023-01-02 16:25:18 -08:00
Kistaro Windrider	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
Kistaro Windrider	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
Kistaro Windrider	78f0a96529	calc_push op loop golf Reorganizing conditionals saves tokens here.	2023-01-02 15:58:23 -08:00
Kistaro Windrider	d792831370	can_move also takes a rope operation table this is approximately token-neutral but performance-saving. each function parameter makes its call cost worse. When can_move is called inside a loop, we already have a table and we unpack to call can_move; moving the unpack into can_move saves us marshalling cost. It requires us to construct a table in a different spot (where we were not previously doing so) but that spot is not in a loop.	2023-01-02 15:57:27 -08:00
Kistaro Windrider	b1cc74fe3b	Remove unused vars, convert tug_crate arg to table The tug_crate conversion is for performance. `foreach(tbl, predefined_func)` is substantially faster than a standard `for` loop using the `all` iterator. However, if the function inside the foreach is defined inline, it's much slower due to closure-construction overhead (even though nothing is being closed over). Converting `tug_crate` to take a table as an argument allows foreach to feed right into it, and it also naturally suggests a rewrite a few lines down to get rid of duplicative listing of `mx0,my0,dmx,dmy`, saving several tokens. I'm going to take a look at can_move to see if it's worth making iits mx0,my0,dmx,dmy arguments into a table as well.	2023-01-02 15:35:10 -08:00
Kistaro Windrider	0aeeb1975b	Show blocked crate moves (#24 ) Save/load system. Not golfed. Saves the music flag, the last level the player played, and the furthest level reached. Loads music flag on launch. Title screen starts on most recent level played; when in "release configuration" the title screen will only let the player pick levels up to the maximum reached through gameplay, but right now this is replaced with the 31. Save file can be wiped by holding the down arrow at the title screen. block writes while reading Disabling writes during "wipe" and "first load" is not quite semantically what we want, it's writes during read we want to block. This happens because turning the music on or off tries to save the state, and it's easier to just ignore that persistence request than to rework the music code so it doesn't. "wipe" and "first load" are when we're actually reading (and enacting) state, but it's the act of reading rather than those two acts that should block writes. It is also unwilling to write until it's done its first read, which I think is a feature; it makes it harder to accidentally blank out the player's data. Show blocked moves as an animated X. I am not convinced the sprite is very good. This could help the player learn what pulls were considered before proposing the ones that would occur if the player pulled the tongue. Or it's just visual noise that sucks. Anyway, this correctly captures what the blocked considered moves were, and we can decide whether to use it or not. Reviewed-on: pyrex/chameleonic#24 Co-authored-by: Kistaro Windrider <kistaro@gmail.com> Co-committed-by: Kistaro Windrider <kistaro@gmail.com>	2023-01-02 23:08:10 +00:00
Kistaro Windrider	b6d1a21b7e	Basic save/load system (#23 ) Save/load system. Not golfed. Saves the music flag, the last level the player played, and the furthest level reached. Loads music flag on launch. Title screen starts on most recent level played; when in "release configuration" the title screen will only let the player pick levels up to the maximum reached through gameplay, but right now this is replaced with the 31. Save file can be wiped by holding the down arrow at the title screen. block writes while reading Disabling writes during "wipe" and "first load" is not quite semantically what we want, it's writes during read we want to block. This happens because turning the music on or off tries to save the state, and it's easier to just ignore that persistence request than to rework the music code so it doesn't. "wipe" and "first load" are when we're actually reading (and enacting) state, but it's the act of reading rather than those two acts that should block writes. It is also unwilling to write until it's done its first read, which I think is a feature; it makes it harder to accidentally blank out the player's data. Reviewed-on: pyrex/chameleonic#23 Co-authored-by: Kistaro Windrider <kistaro@gmail.com> Co-committed-by: Kistaro Windrider <kistaro@gmail.com>	2023-01-02 23:08:03 +00:00