vacation.p8

@@ -577,7 +577,7 @@ function cminskycirc(r,c)
  pset(63.5+r,63.5)
 end
 
-brth_fg={2,12,4,12,2}
+brth_fg={2,3,4,3,2}
 brth_bg={1,2,3,2,1}
 breather = {
  colors = brth_fg,
@@ -649,7 +649,7 @@ function breather:starting_forward()
 end
 
 def_z_pal = {
- [0]=0,129,1,130,4,5,6,7,1,5,6,140,2,12,7,7
+ [0]=0,129,1,2,4,5,6,7,1,5,6,140,2,12,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"
@@ -668,11 +668,11 @@ zonk_mode = {
  --text mode
  txmd=0x81,
  --text spring-in distance
- txd=12,
+ txd=8,
  --text spring-in frames
- txf=30,
+ txf=15,
  --exit frames
- exf=45,
+ exf=60,
  --exit magnitude
  exmg=16,
  --character wait multiplier
@@ -802,20 +802,13 @@ function zonk_mode:next_item()
   self.cx += self.spc_full
   token = tostr(deli(self.line, 1))
  end
- local pp=nrm_txt_pal,1
+ local pp,cmult=nrm_txt_pal,1
  if (token[1]==">") token,self.cx=sub(token,2),self.cx+self.spc_full\2
  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.txd,self.txf)
+ local ret = zonk_txt(token,self.cx,self.cy,pp,self.txmd,self.txf,self.txd*cmult)
  self.cx = ret.eff_w+self.spc_full
- return ret, fbw * twmul(token)
-end
-
-punct = {["."]=2, ["?"]=2, ["!"]=2}
--- token wait multiplier
-function twmul(s)
- if (punct[s[#s]]) return 2
- return 1
+ return ret
 end
 
 function zonk_mode:empty()
@@ -832,13 +825,13 @@ function zonk_mode:update()
  if self.playing_text then
   self.twt -= 1
   if self.twt <= 0 then
-   local item, wt = self:next_item()
+   local item = self:next_item()
    if not item then
     if (not self.file or #self.file == 0) self:next_file()
     self.playing_text=false
    else
     self.txt_frame:push(item)
-    self.twt = wt*self.cmul
+    self.twt = fbw*self.cmul
    end
   end
  else
@@ -1894,9 +1887,6 @@ DOWN: DIVE]],
   {
    f = zonk_mode.new,
    params={{
-    txd=8,
-    txf=15,
-    exf=30,
     br_spd = 240,
     file=[[center:3:18
 hEY, WELCOME BACK!
@@ -1946,16 +1936,10 @@ YOU NEED TO DO RIGHT
 center:1:13 bon bpal:1 set:confirmed:true set:bwt:1 set:txf:2 set:txd:0 set:exd:0 set:exf:10
 bREATHE IN...
 -----
-center:1:14 set:confirmed:true set:bwt:2 bspd:270
+center:1:14 set:confirmed:true set:bwt:2 bpal:2 bspd:270
 bREATHE OUT...
 -----
-center:1:13 bon bpal:1 set:confirmed:true set:bwt:1
-bREATHE IN...
------
-center:1:14 set:confirmed:true set:bwt:2 bspd:300
-bREATHE OUT...
------
-center:1:13 bon bpal:1 set:confirmed:true set:bwt:1
+center:1:13 bon bpal:1 set:confirmed:true set:bwt:1 bspd:300
 bREATHE IN...
 -----
 center:1:14 set:confirmed:true set:bwt:2 bpal:2
@@ -1967,7 +1951,6 @@ set:bwt:0 unset:txd:txf:exf:exd center:4:19
    RELAXATION SO
 EASILY, DOESN'T IT?
 -----
-center:4:19
 >iT HELPS YOUR MIND
  FLOAT AND !DRIFT,
 LIKE A #POOLTOY #ORCA