clear_alt_pal_bits to reset what sea setup does

vacation.p8

@@ -130,10 +130,6 @@ end
 
 function nop() end
 
-blank = {}
-function blank:update() end
-function blank:draw() end
-
 -- puke emits a verbose string
 -- describing item, indented to
 -- the specified depth (0 by
@@ -248,43 +244,16 @@ function _init()
  -- complex fill API mode
  poke(0x5f34, 1)
 
- awakener_hold_frames = 0
+ font_dogica()
- mainview = ao_splash.new()
+ mainview = newtitle()
 end
 
 function _update60()
- if awakener_armed then
-  if btn() & 0x30 > 0 then
-   awakener_hold_frames += 1
-  else
-   awakener_hold_frames = 0
-  end
-  if awakener_hold_frames == 90 then
-   exit_dither = ditherer.new{di=1}
-   awakener_armed = false
-  end
- end
- if exit_dither and exit_dither:update() then
-  exit_dither = nil
-  awakener_hold_frames=0
-  mainview = fast_awakener.new()
- end
  mainview:update()
 end
 
 function _draw()
  mainview:draw()
- if awakener_hold_frames >= 30 then
-  local gpx=(awakener_hold_frames-30) * 2 + 7
-  rectfill(0,0,gpx,9,4)
-  rectfill(gpx+1,0,128,9,5)
-  font_default()
-  print("keep holding for awakener", 1, 1, 7)
-  font_special()
- end
- if exit_dither then
-  exit_dither:draw()
- end
 end
 
 function font_dogica()
@@ -301,35 +270,23 @@ function font_default()
  poke(0x5f58, 0x80)
 end
 
-function font_special()
- poke(0x5f58, 0x81)
-end
-
 -->8
 -- text rendering
 
 -- text colors for zonk mode:
+--  8 -- standard
+--  9 -- delayed fade
+-- 10 -- currently fading in
 txtbox = {
  x=0,
  y=0,
- f=0,
+ text="???",
- interval=4,
+ col=8,
  mode=0x81,
 }
-mknew(txtbox, function(self)
+mknew(txtbox)
- if (not self.cols) self.cols = {14,10,9,8}
- self.c = deli(self.cols)
-end)
 
-function txtbox:update()
+function txtbox:update() end
- if #self.cols > 0 then
-  self.f += 1
-  if self.f >= self.interval then
-   self.f = 0
-   self.col = deli(self.cols)
-  end
- end
-end
 
 function txtbox:draw()
  poke(0x5f58, self.mode)
@@ -348,12 +305,6 @@ spring = {
 }
 mknew(spring)
 
-function easeoutovershoot(t)
- t-=1
- return 1+2.7*t*t*t+1.7*t*t
-end
-
-
 function spring:update()
  local v = self.v
  self.v:update()
@@ -362,7 +313,7 @@ function spring:update()
   return true
  end
  local t, range = self.f/self.frames, self.to - self.from
- v.y = self.from + easeoutovershoot(t)*range
+ v.y = self.to-range*(2^(-10*t)*cos(2*t))
  self.f += 1
 end
 
@@ -386,7 +337,7 @@ function scoot:update()
   return true
  end
  self.f += 1
- if self.f <= 0 then
+ if self.f < 0 then
   v.y=self.from
   return
  end
@@ -400,10 +351,7 @@ end
 
 scootbox = {}
 mknew(scootbox, function(x)
- x.v = view.new{
+ x.v = view.new()
-  x=x.x,
-  y=x.from or scoot.from,
- }
  x.s = scoot.new{
   from=x.from or scoot.from,
   to=x.to or scoot.to,
@@ -432,52 +380,6 @@ function scootbox:draw()
  return self.v:draw()
 end
 
-nrm_txt_pal = split"14,10,9,8"
-sfd_txt_pal = split"15,10,9,8"
-hlt_txt_pal = split"13,11,9,8"
-shd_txt_pal = split"12,12,1,0"
-
-function cparr(t)
- local ret = {}
- for i,x in ipairs(t) do
-  ret[i]=x
- end
- return ret
-end
-
-function zonk_txt(s, x, y, p, md, amt, frms)
- md = md or 0x80
- frms = frms or 0
- amt = amt or 0
- local itv = (frms>>2)&0x7ff
- local t1 = txtbox.new{
-  x=x+1,
-  y=y+1,
-  interval=itv,
-  cols=cparr(shd_txt_pal),
-  mode=md,
-  text=s,
- }
- local v = view.of{
-  t1,
-  txtbox.new{
-   x=x,
-   y=y,
-   interval=itv,
-   cols=cparr(p),
-   mode=md,
-   text=s,
-  },
- }
- itv=spring.new{
-  from=amt,
-  frames=frms,
-  v=v,
- }
- itv.eff_w=t1:xmax()
- return itv
-end
-
 -->8
 -- zonk renderer
 
@@ -494,8 +396,7 @@ mknew(ditherer, function(x)
 end)
 
 function ditherer:update()
- if (self.i > 0 and self.di < 0) self.i += self.di
+ self.i += self.di
- if (self.i < #self.pattern + 1 and self.di > 0) self.i += self.di
  return self.i < 0 or self.i >= #self.pattern + 1
 end
 
@@ -516,8 +417,8 @@ mknew(fuzzy, function(x)
  local p = (x.p or fuzzy.p) & 0xffff
  x.mass = 0
  while p ~= 0 do
-  x.mass += p & 1
+  x.mass += p & 0x8000
-  p = (p >>> 1) & 0xffff
+  p = p << 1
  end
 end)
 
@@ -526,7 +427,7 @@ function fuzzy:update()
  if (self.n < self.interval) return
  self.n = 0
  for i=1,self.tries do
-  local b = 1 << rnd(16)
+  local b = 1 << rnd(15)
   if b & self.p == 0 then
    if i == self.tries or not self.weight or self.mass <= self.weight then
     self.mass += 1
@@ -554,7 +455,7 @@ fuzzy_stripey = {
  weight = 12,
  spacing = 7,
  gap = 32,
- colors = split"3,5,2,1",
+ colors = {5, 2, 1},
 }
 mknew(fuzzy_stripey, function(f)
  f.fuzz = fuzzy.new{
@@ -581,443 +482,13 @@ function fuzzy_stripey:draw()
  end
 end
 
-
---@musurca & @felice
-function cminskycirc(r,c)
- local j,k,rat=r,0,1/r
- poke(0x5f25,c) --set color
- for i=1,r*0.785 do
-  k-=rat*j
-  j+=rat*k
-  pset(63.5+j,63.5+k)
-  pset(63.5+j,63.5-k)
-  pset(63.5-j,63.5+k)
-  pset(63.5-j,63.5-k)
-  pset(63.5+k,63.5+j)
-  pset(63.5+k,63.5-j)
-  pset(63.5-k,63.5+j)
-  pset(63.5-k,63.5-j)
- end
- pset(63.5,63.5-r)
- pset(63.5,63.5+r)
- pset(63.5-r,63.5)
- pset(63.5+r,63.5)
-end
-
-obvious_breather=split"2,3,4,3,2"
-bg_breather=split"1,2,3,2,1"
-breather = {
- colors = obvious_breather,
- sep = 8,
- speed=240,
- f=0,
-}
-mknew(breather)
-
-function breather:update()
- if (self.freeze) return
- local f = self.f + 1
- if (not self.on) f = 0
- if (f >= self.speed) f = -self.speed
- if f == 0 or f == -self.speed then
-  if self.nextspeed then
-   self.speed = self.nextspeed
-   self.nextspeed = nil
-  end
-  if self.off_soon then
-   self.on = false
-   f=0
-  end
-  if self.nextcolors then
-   self.colors=self.nextcolors
-  end
- end
- self.f = f
-end
-
-function easeinout(t)
- if(t<.5) then
-     return t*t*t*4
- else
-     t-=1
-     return 1-t*t*t*-4
- end
-end
-
-function breather:draw()
- fillp(0)
- local cols, f, spd, sep = self.colors, self.f, self.speed, self.sep
- local stall = sep * (#cols - 1)
- local cap = spd-stall
- if (f >= 0) f += stall
- for i,c in ipairs(cols) do
-  local ef = f - (i-1)*sep
-  ef = abs(ef) - stall
-  if ef <= cap and ef > 0 then
-   cminskycirc(easeinout(ef/cap)<<6,c)
-  end
- end
-end
-
-function breather:matches(x)
- if (not x or not self.on) return true
- if (x==1) return self:starting_reverse()
- if (x==2) return self:starting_forward()
- if (x==3) return self:starting_reverse() or self:starting_forward()
- return true
-end
-
-function breather:starting_reverse()
- return self.f + self.speed < self.sep * #self.colors
-end
-
-function breather:starting_forward()
- return self.f > 0 and self.f < self.sep * #self.colors
-end
-
-def_z_pal = {
- [0]=0,129,1,2,4,5,6,7,1,5,6,140,2,13,7,7
-}
-def_14_fade = split"0,0,0,0,0,128,129,133,141,13,6,15,7"
-def_15_fade = split"0,0,128,129,133,141,13,13,6,6,15,15,7"
-def_13_fade = split"0,0,0,0,0,128,129,133,141,140,140,13,12"
-def_shd_fade = split"0,0,0,128,130,141,2"
-
--- frames per character to wait
--- during zonk text display.
-fchr=2
-
-zonk_mode = {
- files={},
- lnh = 9,
- --space width
- spc_w = 2,
- --text mode
- txmd=0x81,
- --text spring-in distance
- txd=10,
- --text spring-in frames
- txf=20,
- --exit frames
- exf=60,
- --exit magnitude
- exmg=16,
- --character wait multiplier
- cmul=1,
- p=def_z_pal,
- fd13 = def_13_fade,
- fd14 = def_14_fade,
- fd15 = def_15_fade,
- fd12 = def_shd_fade,
-
- twt=60,
- expect_cfg_line=true,
- txt_frame=blank,
- playing_text=true,
- cx=0,
- cy=0,
-}
-mknew(zonk_mode, function(self)
- self.stripes=fuzzy_stripey.new{}
- self.brth=breather.new{}
-end)
-
-function zonk_mode:set(_, field,value)
- pukeboard{field=field, value=value}
- self[field]=value
-end
-function zonk_mode:g(_, fn, ...)
- return _ENV[fn](...)
-end
-function zonk_mode:at(_, x, y)
- self.txt_frame=scootbox.new{
-  x=x,
-  from=y,
-  to=y-self.exmg,
-  frames=self.exf,
- }
-end
-function zonk_mode:bon()
- self.brth.on=true
- self.brth.off_soon=false
-end
-function zonk_mode:boff()
- self.brth.off_soon=true
-end
-function zonk_mode:bspd(_, spd)
- self.brth.nextspeed=spd
-end
-function zonk_mode:bpal(_, p)
- self.brth.nextcolors= p == 1 and obvious_breather or bg_breather
-end
-function zonk_mode:activate()
- clear_alt_pal_bits()
- pal()
- font_dogica()
- if (type(self.file) == "string") self.file = split(self.file, "\n")
- if (not self.file) self:next_file()
- assert(self.file)
-end
-function zonk_mode:next_file()
- if #self.files > 0 then
-  self.file=split(deli(self.files,1), "\n")
-  self.expect_cfg_line=true
- end
-end
-
--- return char count, item
--- or 0, nil: end of page
--- or nil (, nil): end of file
-function zonk_mode:next_item()
- if not self.line then
-  if (not self.file or #self.file == 0) return
-  if self.expect_cfg_line then
-   self.expect_cfg_line = false
-   local cfg_line = deli(self.file, 1)
-   for i,cmd in ipairs(split(cfg_line, " ")) do
-    if #cmd > 0 then
-     local frags = split(cmd,":")
-     assert(type(self[frags[1]])=="function", tostr(i).." - "..cfg_line)
-     self[frags[1]](self, unpack(frags))
-    end
-   end
-   return self:next_item()
-  end
-  local line = deli(self.file, 1)
-  if line == "-----" then
-   self.line = nil
-   self.expect_cfg_line = true
-   self.cx = 0
-   self.cy = 0
-   return 0, nil
-  end
-  self.line = split(line, " ")
- end
- if #self.line==0 then
-  self.line = nil
-  self.cx = 0
-  self.cy += self.lnh
-  return self:next_item()
- end
- -- parse token
- local token = tostr(del(self.line, 1))
- while #token == 0 and #self.line > 0 do
-  -- emit extra spaces
-  self.cx += 1 + self.spc_w
-  token = tostr(deli(self.line, 1))
- end
- local pp,cmult=nrm_txt_pal,1
- if (token[1]=="$") token,cmult=sub(token,2),2
- if (token[1]=="^") token,cmult=sub(token,2),0.5
- if (token[1]=="!") token,pp=sub(token,2),sfd_txt_pal
- if (token[1]=="#") token,pp=sub(token,2),hlt_txt_pal
- local ret = zonk_txt(token,self.cx,self.cy,pp,self.txmd,self.txf,self.txd*cmult)
- self.cx = ret.eff_w+self.spc_w
- return #token,ret
-end
-
-function zonk_mode:empty()
- if (self.file and #self.file > 0) return false
- return #self.files == 0
-end
-
-function fadetbl(col, tbl, frac)
- pal(col,tbl[1+(frac*#tbl)&0x7fff],1)
-end
-
-function zonk_mode:update()
- if self.playing_text then
-  self.twt -= 1
-  if self.twt <= 0 then
-   local cn,item = self:next_item()
-   if not cn then
-    self:next_file()
-    self.playing_text=false
-   elseif cn < 0 then
-    self.twt = -cn
-   else
-    self.twt = cn*fchr*self.cmul
-   end
-   if item then
-    self.txt_frame:push(item)
-   else
-    self.playing_text=false
-   end
-  end
- else
-  --waiting to advance or exit
-  if self.wtmr then
-   self.twt += self.wait_more
-   self.wtmr = nil
-  end
-  if self.twt <= 0 then
-   if (btnp(1)) self.confirmed=true
-   if not self.nextpage and self.confirmed and self.brth:matches(self.bwt) then
-    self.nextpage = true
-    self.txt_frame.go = true
-    self.fpfrm = self.exf
-   end
-  else
-   self.twt -= 1
-  end
- end
- if self.nextpage and not self.d then
-  if self.fpfrm > 0 then
-   self.fpfrm -= 1
-  elseif self:empty() then
-   self.txt_frame=blank
-   self.d = ditherer.new{di=0.5}
-  else
-   self.nextpage = false
-   self.confirmed=false
-   self.txt_frame=blank
-   self.playing_text=true
-   self.fpfrm=nil
-  end
- end
- self.stripes:update()
- self.brth:update()
- self.txt_frame:update()
- if (self.d and self.d:update()) seq:next()
-end
-
-function zonk_mode:draw()
- cls(0)
- pal(self.p, 1)
- self.stripes:draw()
- self.brth:draw()
- if self.fpfrm then
-  local ffrac = self.fpfrm/self.exf
-  fadetbl(12, self.fd12, ffrac)
-  fadetbl(13, self.fd13, ffrac)
-  fadetbl(14, self.fd14, ffrac)
-  fadetbl(15, self.fd15, ffrac)
- end
-  self.txt_frame:draw()
- -- TODO: draw throbber
- if not self.playing_text and not self.confirmed and self.twt <= 0 then
-  print("➡️",121,121,12)
-  print("➡️",120,120,self:throbber_color())
- end
- if(self.d) self.d:draw()
-end
-
-function zonk_mode:throbber_color()
- if (not self.bwt) return ((t()<<1)&0x1 < 1) and 7 or 6
- return self.brth:matches(self.bwt) and 7 or 6
-end
-
 -->8
 -- awakener
 
-fast_awakener = {}
-mknew(fast_awakener)
-
-function fast_awakener:update()
- --todo: implement
-end
-
-function fast_awakener:draw()
- cls()
- pal()
- clear_alt_pal_bits()
- font_default()
- print("placeholder", 45, 61, 8)
-end
 
 -->8
 -- consent screens
 
-ao_splash = {
- fwait = 180,
-}
-mknew(ao_splash, function(self)
- self.c = breather.new{
-  colors={7,15,14,8,2},
-  sep=3,
-  f=15,
-  on=true,
- }
- font_dogica()
-end)
-
-function ao_splash:update()
- if self.c.f < self.c.speed/2.5 then
-  self.c:update()
-  return
- end
- self.fwait -= 1
- if (self.fwait < ao_splash.fwait-30 and (btnp() & 0xf > 0) and self.fwait > 0) self.fwait = 0
- if self.fwait == 0 then
-  self.d = ditherer.new{di=1}
- end
- if (self.d) self.d:update()
- if self.fwait <= -32 then
-  -- TODO: consent screen
-  mainview=consent_splash.new()
-  mainview:update()
- end
-end
-
-function ao_splash:draw()
- cls()
- self.c:draw()
- if self.fwait < ao_splash.fwait then
-  print("18+", 55, 60, 7)
-  print("aDULTS ONLY", 35, 90, 15)
- end
- if (self.d) self.d:draw()
-end
-
-consent_splash = {
- f = 0,
-}
-mknew(consent_splash, function(self)
- self.d = ditherer.new{
-  di=-1
- }
- awakener_armed = true
- awakener_hold_frames = 0
-end)
-
-function consent_splash:update()
- if (self.f < 0x7fff) self.f += 1
- if (btnp(1) and self.f > 150) self.d.di = 1
- if self.d:update() and self.d.di > 0 then
-  mainview=newtitle()
-  mainview:update()
- end
-end
-
-function consent_splash:draw()
- cls()
- font_special()
- print("\^w\^twarning", 20, 2, 10)
- font_default()
- cursor(1, 25)
- color(6)
- print("this game will \fchypnotize\f6 you.")
- if (self.f < 45) return
- print("")
- print("hypnotic suggstions include:")
- print("relaxation, trance, obedience,")
- print("loss of volition, euphoria, joy,")
- print("amnesia, identity loss, and the")
- print("experience of \fetranformation")
- print("into a pooltoy orca.\f6")
- if (self.f < 90) return
- print("")
- print("an awakener that removes all")
- print("suggestions is available at")
- print("\faany time:\f6 hold ❎ or 🅾️.")
- print("gameplay uses only arrows.")
- if(self.f < 300) return
- print("")
- print("")
- print("           consent and begin: \f7➡️")
- self.d:draw()
-end
-
 -->8
 -- title screen
 
@@ -1050,8 +521,8 @@ function title_screen:draw()
 end
 
 function title_screen:update()
- if (btnp(1)) self.d.di = 1
+ self.d:update()
- if(self.d:update() and self.d.di > 0) start_game()
+ if (btnp(1)) start_game()
 end
 -->8
 -- dolphin sprite renderer
@@ -1249,8 +720,7 @@ function toyphin:draw()
  spr(st.s[1+(((t()<<1)&0x0.FFFF*#st.s)&0x7FFF)], self.x + st.xo, y + st.yo, self.state.ws, self.state.hs)
 end
 
--->8
+-->8 word target
--- arcade mode
 
 wordtarget = {
  x = 129,
@@ -1287,6 +757,9 @@ function wordtarget:draw()
  print(self.str, self.x, self.y, 0x100a)
 end
 
+-->8
+-- arcade mode
+
 -- palette use:
 -- 0: shallow sea blue (1)
 -- 1: black (for sprites)
@@ -1539,53 +1012,23 @@ function sequencer:next()
  else
   mainview = rec.f()
  end
- if(mainview.activate) mainview:activate()
  mainview:update()
 end
 
 function start_game()
  seq = sequencer.new{
-  {
-   f=zonk_mode.new,
-   params={{
-    file=[[at:2:55
-hI! iN A LATER VERSION
-THERE WILL BE ACTUAL
-INSTRUCTIONS HERE AND
-THE BG WON'T BE ON.]],
-    txd=0,
-    txf=1,
-    cmul=0.25,
-   }},
-  },
   {
    f = arcade_level.new,
    params = {{
-    max_score=5,
+    max_score=2,
    }}
   },
   {
-   f = zonk_mode.new,
+   f = function()
-   params={{
+    pal()
-    file=[[at:40:40
+    clear_alt_pal_bits()
-ZONK TEXT TEST
+    return view.of{bg.new{c=6}, fuzzy_stripey.new{interval=7, colors={12, 7, 14}, weight=8}}
-#ZONK TEXT #TEST
+   end,
-$ZONK $TEXT $TEST
-!ZONK !TEXT !TEST
-^ZONK ^TEXT ^TEST
------
-at:30:60 bon bpal:1 set:confirmed:true set:bwt:1 set:txf:2 set:txd:0 set:exd:0 set:exf:10
-bREATHE IN...
------
-at:28:60 set:confirmed:true set:bwt:2 bpal:2
-bREATHE OUT...
------
-set:bwt:0 set:txd:16 set:txf:20 set:exf:60 at:1:55
-gREAT! iT'S LIKE YOU'VE
-  BEEN DOING THIS YOUR
-         ENTIRE LIFE.
-    ]],
-   }},
   },
  }
  seq:next()