Compare commits

...

3 Commits

View File

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