fixed it

* wrong Y positions for everything
* both directions are "enter"

rearm_prototype.p8

@@ -4,20 +4,85 @@ __lua__
 -- vacuum gambit
 -- by kistaro windrider
 
+-- stdlib
+
+-- generate standard "overlay"
+-- constructor for type tt.
+-- if tt.init is defined, generated
+-- new calls tt.init(ret) after
+-- ret is definitely not nil,
+-- before calling setmetatable.
+-- use to initialize mutables.
+--
+-- if there was a previous new,
+-- it is invoked on the new
+-- object *after* more, because
+-- this works better with the
+-- `more` impls i use.
+function mknew(tt)
+ local mt,oldnew,more = {__index=tt},tt.new,rawget(tt, "init")
+ tt.new=function(ret)
+  if(not ret) ret = {}
+  if(more) more(ret)
+  if(oldnew) oldnew(ret)
+  setmetatable(ret, mt)
+  return ret
+ end
+ return tt
+end
+
+function easeoutbounce(t)
+	local n1=7.5625
+	local d1=2.75
+
+	if (t<1/d1) then
+		return n1*t*t;
+	elseif(t<2/d1) then
+		t-=1.5/d1
+		return n1*t*t+.75;
+	elseif(t<2.5/d1) then
+		t-=2.25/d1
+		return n1*t*t+.9375;
+	else
+		t-=2.625/d1
+		return n1*t*t+.984375;
+	end
+end
+
+-->8
+-- entry points
 function _draw()
  cls()
  draw_hud_placeholder()
- draw_weap_opt(0,0,frame_col(item==1),1,"hull","\n  +1\n max\nhealth")
- draw_weap_opt(56,0,frame_col(item==2),2,"vulc","  rate\n\n faster\n firing\n  rate")
+ -- draw_static()
+ left_pane:draw()
+ right_pane:draw()
+ rearm_pane_instance:draw()
+end
+
+function draw_static()
+ draw_weap_opt(0,0,frame_col(item==1),1,"hull","\n    +1\n   max\n  health")
+ draw_weap_opt(56,0,frame_col(item==2),2,"vulc","   rate\n\n  faster\n  firing\n   rate")
  draw_rearm(frame_col(item<0))
 end
 
 function _init()
  item=1
  bfm=1
+ crt_frm = 1
+ left_pane = weapon_pane.new{}
+ right_pane = weapon_pane.new{
+  is_left=false,
+  s = 2,
+  hdr = "vulc",
+  body = "   rate\n\n  faster\n  firing\n   rate",
+  hot = function() return item == 2 end}
+ rearm_pane_instance = rearm_pane.new{hot=function() return item < 0 end}
 end
 
 function _update()
+ crt_frm += 0.5
+ if (crt_frm >= 9) crt_frm = 1
  if (btn(3) and item > 0 or btn(2) and item < 0) item = -item
  if (btn(0)) item = 1
  if (btn(1)) item = 2
@@ -26,6 +91,22 @@ function _update()
  else
   bfm += 1
  end
+
+ if btnp(4) then
+  left_pane.pos = -1
+  right_pane.pos = -1
+  rearm_pane_instance.pos = -1
+ end
+
+ if btnp(5) then 
+  left_pane.pos = 1
+  right_pane.pos = 1
+  rearm_pane_instance.pos = 1
+ end
+
+ left_pane:update()
+ right_pane:update()
+ rearm_pane_instance:update()
 end
 
 function draw_hud_placeholder()
@@ -35,16 +116,19 @@ function draw_hud_placeholder()
  line(113,127)
 end
 
+-->8
+-- rearm pane drawing
+
+crt={-91,-166,-2641,-1441,-23041,23295,-20491,24570}
+
 function glow_box(x0, y0, x1, y1, c, cf)
  rect(x0, y0, x1, y1, c[1])
  rect(x0+1, y0+1, x1-1, y1-1, c[2])
  rect(x0+2, y0+2, x1-2, y1-2, c[1])
- if cf then
-  -- todo: animate "dot crawl" background
- 	fillp(…)
-  rectfill(x0+3, y0+3, x1-3, y1-3, cf)
-  fillp()
- end
+ rect(x0+3, y0+3, x1-3, y1-3, 0)
+ fillp(crt[crt_frm&0xff])
+ rectfill(x0+4, y0+4, x1-4, y1-4, cf)
+ fillp()
 end
 
 function frame_col(hot)
@@ -68,6 +152,66 @@ function draw_rearm(c)
  print("full ammo\nfull shield\n+50% health",54, 106, 6)
 end
 
+-->8
+-- rearm pane objects
+easing_pane = mknew{
+ -- to enter: pos = -1; to exit: pos = 1
+ -- runs for 16 frames
+}
+
+function easing_pane:frac()
+ local pos = self.pos
+ if (not pos) return
+ if (pos < 0) return 1-easeoutbounce(1+pos)
+ if (pos > 0) return easeoutbounce(1-pos)
+ return 0
+end
+
+function easing_pane:update()
+ local pos = self.pos
+ if (not pos or pos == 0) return
+ -- increment is 0x0.1 -- 1/16th of pos
+ if (pos < 0) pos = min(pos + 0x0.1, 0)
+ if pos > 0 then
+  pos -= 0x0.1
+  if (pos <= 0) pos = nil
+ end
+ self.pos = pos
+end
+
+weapon_pane = mknew(easing_pane.new{
+ is_left = true,
+ s = 1,
+ hdr = "hull",
+ body = "\n    +1\n   max\n  health",
+ hot = function() return item == 1 end,
+})
+
+function weapon_pane:draw()
+ local frac, is_left = self:frac(), self.is_left
+ if (not frac) return
+ camera(
+  frac * (is_left and 55 or -128) + (1-frac) * (is_left and 0 or -56),
+  0)
+ glow_box(0,0,55,100,frame_col(self:hot()),1)
+ spr(self.s,5, 5)
+ print(self.hdr, 13, 8, 7)
+ print(self.body, 5, 15, 6)
+ camera()
+end
+
+rearm_pane = mknew(easing_pane.new{})
+
+function rearm_pane:draw()
+ local frac = self:frac()
+ if (not frac) return
+ camera(0, -28 * frac)
+ glow_box(0,101,111,127,frame_col(self:hot()),5)
+ spr(5,15,107,4,2)
+ print("full ammo\nfull shield\n+50% health",54, 106, 6)
+ camera()
+end
+
 __gfx__
 000000000b00000000000a0007700770000aa0000444440004444444000000000000000000000000000000000000000000000000000000000000000000000000
 00000000bba80880000008000aa00aa00a0880a0447777700477777a000000000000000000000000000000000000000000000000000000000000000000000000
@@ -77,9 +221,9 @@ __gfx__
 00700700008888200000800008800880a000000a47a4477a047a4440000000000000000000000000000000000000000000000000000000000000000000000000
 000000000008820000a0000008800880080aa080477777a00477777a000000000000000000000000000000000000000000000000000000000000000000000000
 0000000000002000008000000880088000088000477770000422aaaa222200020000020000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000047a77700022ee0002eeee002e00022e000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000047a4777002ea2e002e002e02ee022ee000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000047a0477a22ea2e002e002e02e2e2e2e000000000000000000000000000000000000000000000000000000000
+0d5000000000000000000000000000000000000047a77700022ee0002eeee002e00022e000000000000000000000000000000000000000000000000000000000
+d00000000000000000000000000000000000000047a4777002ea2e002e002e02ee022ee000000000000000000000000000000000000000000000000000000000
+500000000000000000000000000000000000000047a0477a22ea2e002e002e02e2e2e2e000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000047a0047a2e2222e02e222e02e02e02e000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000047a0047a2eeeeeea2eeee002e02e02e000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000aa000aa2e7aa2ea2e00e002e02e02e000000000000000000000000000000000000000000000000000000000