fix hokey pokey menu

the menu eases in, the menu eases out, the menu eases in and you shake it all about

vacuum_gambit.p8

@@ -124,11 +124,12 @@ function linked_list:pop_front()
 end
 
 function _init()
+ mode = game_mode
  init_blip_pals()
 	wipe_level()
 	primary_ship.main_gun = zap_gun_p.new()  -- redundant?
 	load_level(example_level_csv)
-	state = game
+	game_state = game
 	pal(2,129)
 	pal()
 end
@@ -172,7 +173,7 @@ function wipe_level()
 end
 
 function _update60()
- updategame()
+ mode:update()
 end
 
 function call_f(x)
@@ -184,6 +185,10 @@ function call_move(x)
 end
 
 function updategame()
+ if (primary_ship.xp >= primary_ship.xptarget) and (lframe - primary_ship.last_xp_frame > 0x0.000f) and (not primary_ship.dead) then
+  mode = rearm_mode.new()
+  return _update60()
+ end
  leveldone = level_frame()
  events:vore(new_events)
  events:strip(call_move)
@@ -249,9 +254,9 @@ function updategame()
  intangibles_fg:strip(call_move)
 
 	if leveldone and not eships.next and not ebullets.next and not events.next then
-	  state = win
+	  game_state = win
 	end
-	if (not pships.next) state = lose
+	if (not pships.next) game_state = lose
 
  if primary_ship.xp >= primary_ship.xptarget then
   if not xpwhoosh then
@@ -266,14 +271,24 @@ function updategame()
 end
 
 function _draw()
+ mode:draw()
+end
+
+function drawgame_top()
+ camera()
  fillp(0)
  drawgame()
- if (state == game) fadelvl = -45
- if (state == win) dropshadow("win",50,61,11)
- if (state == lose) dropshadow("fail",48,61,8)
+ if (game_state == game) fadelvl = -45
+ if (game_state == win) dropshadow("win",50,61,11)
+ if (game_state == lose) dropshadow("fail",48,61,8)
  fadescreen()
 end
 
+game_mode = {
+ update = updategame,
+ draw = drawgame_top,
+}
+
 fadetable = split"0,1.5,1025.5,1029.5,1285.5,1413.5,9605.5,9637.5,-23130.5,-23066.5,-18970.5,-18954.5,-2570.5,-2568.5,-520.5,-8.5,-0.5"
 
 function fadescreen()
@@ -368,8 +383,10 @@ function drawhud()
  else
   vertmeter(115,58,118,117,primary_ship.xp, primary_ship.xptarget, powcols)
  end
- -- 59 px vertically? or 60? off-by-1 error somewhere here or in vertmeter?
- -- it's here. I think
+ -- 60 px vertically. note that
+ -- there was at one point an
+ -- off-by-one and I'm not sure
+ -- it's actually fixed
  local mxs, cs, mxh, ch = primary_ship.maxshield, primary_ship.shield, primary_ship.maxhp, primary_ship.hp
  if (mxs > 0) and (mxh > 0) then
   local split = 59 * (mxs / (mxs + mxh)) \ 1 + 64
@@ -411,9 +428,13 @@ end
 
 function vertmeter(x0,y0,x1,y1,val,maxval,cols)
  if ((val <= 0) or (maxval <= 0)) return
+ if val < 0x0.001 or maxval < 0x0.001 then
+  val *= 16
+  maxval *= 16
+ end
  val=min(val, maxval)
  local h = y1-y0
- local px = val/maxval * h \ 1
+ local px = val*h/maxval \ 1
  local ncols = #cols
  local firstcol = ((h-px)*ncols\h)+1
  local lastbottom = y0+(h*firstcol\ncols)
@@ -452,6 +473,7 @@ ship_m = mknew{
  maxshield = 0,
  shieldcooldown =  0x0.003c,--1s
  shieldpenalty = 0x0.012c, --5s
+ shield_refresh_ready = 0,
  
  slip = true,  -- most enemies slide
  
@@ -474,14 +496,15 @@ function ship_m:die()
  local sz4 = self.size * 4
  local cx, cy, xp, z = self.x + sz4, self.y + sz4, self.xp or 0, 0
  boom(cx, cy, 3*sz4, self.boss)
- if xp > 499 then
+ if xp > 0x0.01f3 then  -- dec 499
   -- spawn a huge gem with all
   -- overage XP, min 100
-  spawn_xp_at(cx, cy, 0, xp-399)
-  xp = 399
+  spawn_xp_at(cx, cy, 0, xp-0x0.018f)
+  xp = 0x0.018f  -- dec 399
   z += 1
  end
- for gsz in all{100, 25, 5, 1} do
+ -- 100, 25, 5, 1
+ for gsz in all{0x0.0064, 0x0.0019, 0x0.0005, 0x0.0001} do
   while xp >= gsz do
    spawn_xp_at(cx, cy, z, gsz)
    xp -= gsz
@@ -939,9 +962,10 @@ player = mknew(ship_m.new{
  shield = 2, -- regenerates
  maxshield = 2,
 
- -- xp; watch out for 16-bit range limits
+ -- xp in increments of 0x0.0001
  xp = 0,
- xptarget = 4,
+ xptarget = 0x0.0004,
+ last_xp_frame = 0,
  level = 1,
 
  -- gun
@@ -999,7 +1023,7 @@ frownie = mknew(ship_m.new{
  sparkodds = 8,
  
  hp = 0.5, -- enemy ships need no max hp
- xp = 1,
+ xp = 0x0.0001,
 
  -- position
  x=60, -- x and y are for upper left corner
@@ -1021,7 +1045,7 @@ frownie = mknew(ship_m.new{
 blocky = mknew(frownie.new{
  sprite = 10,
  hp = 1.5,
- xp = 2,
+ xp = 0x0.0002,
  hurt = {
   x_off = 0,
   y_off = 0,
@@ -1041,7 +1065,7 @@ blocky = mknew(frownie.new{
 
 spewy = mknew(frownie.new{
  sprite=26,
- xp = 3,
+ xp = 0x0.0003,
  hurt = {
   x_off=0,
   y_off=1,
@@ -1062,7 +1086,7 @@ spewy = mknew(frownie.new{
 
 chasey = mknew(ship_m.new{
  sprite = 5,
- xp = 4,
+ xp = 0x0.0004,
  size = 1,
  hurt = {
   x_off = 1,
@@ -1097,7 +1121,7 @@ end
 
 xl_chasey=mknew(chasey.new{
  size=2,
- xp = 10,
+ xp = 0x0.000a,
  maxspd=1.25,
  hurt = {
   x_off = 2,
@@ -1595,7 +1619,7 @@ function spawn_xp_at(x, y, off, amt)
  x += rnd(off+off)-off
  y += rnd(off+off)-off
  xp_gem.new{
-  qsprite=amt == 1 and 32 or amt == 5 and 33 or amt == 25 and 34 or 35,
+  qsprite=amt == 0x0.0001 and 32 or amt == 0x0.0005 and 33 or amt == 0x0.0019 and 34 or 35,
   val = amt,
  }:spawn_at(mid(x, 0, 124),mid(y,-4,125))
 end
@@ -1733,6 +1757,161 @@ function spawn_spec_gun_at(x, y, gunt)
  gun_p:spawn_at(x, y)
 end
 
+-->8
+-- rearm screen
+
+rearm_mode = mknew{
+ sel=1,
+ bfm=1,
+ crt_frm = 1,
+ pos=-1,
+ init=function(this)
+  poke(0x5f5c, 255) --no btnp repeat
+  rearm_mode.shuffle(this)
+ end,
+}
+
+crt={-91,-166,-2641,-1441,-23041,23295,-20491,24570}
+
+function rearm_mode:glow_box(x0, y0, x1, y1, c, cf)
+ for i,v in ipairs{c[1],c[2],c[1],0} do
+  i -= 1
+  rect(x0+i,y0+i,x1-i,y1-i,v)
+ end
+ fillp(crt[self.crt_frm&0xff])
+ rectfill(x0+4, y0+4, x1-4, y1-4, cf)
+ fillp()
+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
+
+
+function rearm_mode:frame_col(hot)
+ if (not hot) return {4,10}
+ if (self.bfm<=16) return {14,7}
+ return {2,8}
+end
+
+function rearm_mode:draw_option(id)
+ local rec = self.options[id]
+ self:glow_box(0,0,55,100,self:frame_col(self.sel == id),1)
+ spr(rec.s,5, 5)
+ print(rec.hdr, 13, 8, 7)
+ print(rec.body, 5, 15, 6)
+end
+
+function rearm_mode:pos_frac()
+ local pos = self.pos
+ if (not pos) return
+ if (pos < 0) return 1-easeoutbounce(1+pos)
+ if (pos > 0) return (1-pos)*(1-pos)
+ return 0
+end
+
+function rearm_mode:shuffle()
+ -- these will be placeholders
+ -- until the upgrade deck
+ -- is a thing that exists
+ self.options = {{
+  s=1,
+  hdr=" hull",
+  body = "\n    +1\n   max\n  health",
+  action = function() end,
+ },{
+  s=37,
+  hdr=" vulc",
+  body = "\nplaceholder",
+  action = function() end,
+ }}
+end
+
+function rearm_mode:draw()
+ drawgame_top()
+ local frac = self:pos_frac()
+ camera(frac * 55, 0)
+ self:draw_option(1)
+ camera(frac * -128 + (1-frac) * -56, 0)
+ self:draw_option(2)
+ camera(0, -28 * frac)
+ self:glow_box(0,101,111,127,self:frame_col(self.sel < 0),1)
+ spr(96,15,107,4,2)
+ print("full ammo\nfull shield\n+50% health",54, 106, 6)
+end
+
+function rearm_mode:update_pos()
+ local pos = self.pos
+ if (not pos) return
+ if (pos == 0) then
+  if (primary_ship.xp < primary_ship.xptarget) self.pos = 1
+  xpwhoosh = nil
+  return
+ end
+ if (pos < 0) pos = min(pos + 0x0.05, 0)
+ if pos > 0 then
+  pos -= 0x0.1
+  if (pos <= 0) pos = 999
+ end
+ self.pos = pos
+end
+
+function rearm_mode:update()
+ self:update_pos()
+ if self.pos > 1 then
+  mode = game_mode
+  return  -- do not advance frame
+ end
+ local sel, bfm = self.sel, self.bfm
+ if (btn(3) and sel > 0 or btn(2) and sel < 0) sel=-sel
+ if (btn(0)) sel = 1
+ if (btn(1)) sel = 2
+ if (btn()&0xF ~= 0) and bfm >= 10 or bfm >= 30 then
+  bfm = 1
+ else
+  bfm += 1
+ end
+ self.bfm = bfm
+
+ if primary_ship.xp < primary_ship.xptarget then
+  sel = 0
+ elseif btnp(4) or btnp(5) and self.pos == 0 then
+  if sel < 0 then
+   -- todo: sound: rearm
+   primary_ship.shield = primary_ship.maxshield
+   -- todo: rewrite for three guns
+   if (primary_ship.special_gun) primary_ship.special_gun.ammo = primary_ship.special_gun.max_ammo
+   primary_ship.hp = min(primary_ship.maxhp, primary_ship.hp + primary_ship.maxhp/2)
+   primary_ship.xp -= primary_ship.xptarget / 2
+  else
+   local c = self.options[sel]
+   if c then
+    -- todo: sound: upgrade
+    c:action()
+    primary_ship.xp -= primary_ship.xptarget
+    primary_ship.xptarget += primary_ship.level * 0x0.0002
+    primary_ship.level += 1
+    if (primary_ship.xp >= primary_ship.xptarget) self:shuffle()
+   end
+  end
+ end
+ self.sel = sel
+end
+
 __gfx__
 00000000000650000000000000000000bb0b50b59909209200cc0c00000000003b00000082000000e00e8002e00e800200333300002222000000000000000000
 00000000006765000000000000cccc00b50b3055920940220c0000c000bbbb0037000000a2000000e0e8880240e8480403bbbb30028888200000000000000000
@@ -1750,14 +1929,14 @@ __gfx__
 000000005666657576667650000000000b0000b000000000000000000000000000000000000dd0009092220200000000c111111d656667650000000000000000
 0000000056565066665656500000000000bbbb0000000000000000000000000000000000000000000090020000000000c111111d650650650000000000000000
 00000000565000566500065000000000b000000b000000000000000000000000000000000000000000a00a0000000000cddddddd650000650000000000000000
-000000000c00070006000700066007600000000000a0008000000000000000000000000000000000000000000000000000000000000000000000000000000000
-0c000700ccd07cd06cd07cd06ccd7ccd000000000090008000000000000000000000000000000000000000000000000000000000000000000000000000000000
-0d000d000d000d006cd06cd06ccd6ccd0000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000000000d000d000dd00dd0000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000c000c00060006000670066000000000000a080000000000000000000000000000000000000000000000000000000000000000000000000000000000
-0c000c00c7d0cc7067d06cd067cd6ccd000000000009080000000000000000000000000000000000000000000000000000000000000000000000000000000000
-07000c000d0007007cd06c707ccd6c77000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000000000d0007000dd00d70000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+060007000600070006600770766c777c0000000000a0008000000000000000000000000000000000000000000000000000000000000000000000000000000000
+6cd07cd06cd07cd06ccd7ccd6ccd7ccd000000000090008000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0d000d006cd07cd06ccd7ccd6ccd7ccd0000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000
+000000000d000d000dd00dd0cdd1cdd0000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0600060006000600066006607667766c00000000000a080000000000000000000000000000000000000000000000000000000000000000000000000000000000
+67d06c7067d06c70677d6cc7677d6cc7000000000009080000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0d00070067d06c7067cd6cc767cd6cc7000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+000000000d0007000dd007707dd1c771000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000cccccccccccccccc77000000007700000000770000000077000000000000000000000000000000000000000000000000
 00000000000000000000000000000000c116611dc11ee11d70000000077000000007700000000770000000070000000000000000000000000000000000000000
 00000000000000000000000000000000c1611c1dc11ee11d00000000770000000077000000007700000000770000000700000000000000000000000000000000
@@ -1778,6 +1957,26 @@ c1111111111d0000c1111111111d0000c1111111111d0000c111eeee111d0000c11e2222e11d0000
 c1111111111d0000c1111111111d0000c1111111111d0000c1111111111d0000c111eeee111d0000c1ee2222ee1d0000ce22111122ed0000c2111111112d0000
 c1111111111d0000c1111111111d0000c1111111111d0000c1111111111d0000c1111111111d0000c111eeee111d0000ceee2222eeed0000c2221111222d0000
 cddddddddddd0000cddddddddddd0000cddddddddddd0000cddddddddddd0000cddddddddddd0000cddddddddddd0000cddddddddddd0000cddddddddddd0000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+04444400044444440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+447777700477777a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+477aaa7a0477aaaa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+47a0047a047a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+47a0447a047a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+47a4477a047a44400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+477777a00477777a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+477770000422aaaa2222000200000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+47a77700022ee0002eeee002e00022e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+47a4777002ea2e002e002e02ee022ee0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+47a0477a22ea2e002e002e02e2e2e2e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+47a0047a2e2222e02e222e02e02e02e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+47a0047a2eeeeeea2eeee002e02e02e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0aa000aa2e7aa2ea2e00e002e02e02e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+000000002e0002e02e002e02e02e02e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+000000000e0000e00e000e00e00e00e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 __label__
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007777777777777777
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007666666666666665