fix autoconfirm rest, make breath bloops zonky

This commit is contained in:
Kistaro Windrider 2024-02-18 12:54:52 -08:00
parent bd03f0ad5c
commit 50c0fb47c0
Signed by: kistaro
SSH Key Fingerprint: SHA256:TBE2ynfmJqsAf0CP6gsflA0q5X5wD5fVKWPsZ7eVUg8

View File

@ -835,12 +835,12 @@ function fadetbl(col, tbl, frac)
end end
function zonk_mode:update() function zonk_mode:update()
self.confirmed = self.confirmed or self.ac
if (not self.brth:matches(self.bwt)) self.alwaysmatched=false if (not self.brth:matches(self.bwt)) self.alwaysmatched=false
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, wt = self:next_item() local item, wt = self:next_item()
self.confirmed = self.confirmed or self.ac
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
@ -848,7 +848,7 @@ function zonk_mode:update()
else else
self.txt_frame:push(item) self.txt_frame:push(item)
self.twt = wt*self.cmul self.twt = wt*self.cmul
psound(8,0,4,self.txf>4) psound(8,0,4,self.txf>1)
end end
end end
else else
@ -933,22 +933,22 @@ bpal:1 set:bwt:2 c:3:19
FULLY ALERT AT THE FULLY ALERT AT THE
>COUNT OF #5... >COUNT OF #5...
----- -----
set:exf:10 set:txf:30 set:txd:45 set:ac:1 bgdy:0.1 bspd:225 c:1:1 set:exf:10 set:txf:30 set:txd:45 set:ac:1 bgwt:9 bgdy:0.1 bspd:225 c:1:1
1 1
----- -----
set:ac:1 bspd:210 bgdy:0.15 bgwt:10 c:1:1 bspd:210 bgdy:0.15 bgwt:10 c:1:1
2 2
----- -----
set:ac:1 bspd:180 bgdy:0.2 bgwt:12 c:1:1 bspd:180 bgdy:0.2 bgwt:11 c:1:1
3 3
----- -----
set:ac:1 bgdy:0.25 bpal:2 bgwt:14 c:1:1 bgdy:0.25 bpal:2 bgwt:12 c:1:1
4 4
----- -----
set:ac:1 bgdy:0.4 bgwt:16 c:1:1 bgdy:0.3 bgwt:13 c:1:1
5 5
----- -----
set:hide_breath:1 set:hide_stripes:1 boff set:txf:1 set:txd:0 set:exd:0 set:exf:1 set:bwt:0 c:1:11 set:hide_breath:1 unset:ac set:hide_stripes:1 boff set:txf:1 set:txd:0 set:exd:0 set:exf:1 set:bwt:0 c:1:11
wide awake! wide awake!
]] ]]
@ -1786,10 +1786,10 @@ DRIFT,SOAR,IMAGINE,BE
RELAX,CHILL,TOY,POOLTOY RELAX,CHILL,TOY,POOLTOY
SINK,DEEP,TRANCE,FOLLOW]] SINK,DEEP,TRANCE,FOLLOW]]
basic_breathe=[[c:1:13 bon set:ac:true set:bwt:1 basic_breathe=[[c:1:13 bon set:ac:1 set:bwt:1
bREATHE IN... bREATHE IN...
----- -----
c:1:14 set:ac:true set:bwt:2 c:1:14 set:bwt:2
bREATHE OUT...]] bREATHE OUT...]]
function sequencer:next() function sequencer:next()
@ -1936,19 +1936,19 @@ tHAT ALL SOUNDS LIKE
YOU NEED TO DO RIGHT YOU NEED TO DO RIGHT
!NOW IS TO #BREATHE. !NOW IS TO #BREATHE.
----- -----
c:1:13 bon bpal:1 set:ac:true set:bwt:1 set:txf:2 set:txd:0 set:exd:0 set:exf:10 c:1:13 bon bpal:1 set:ac:1 set:bwt:1 set:txf:4 set:txd:0 set:exd:0 set:exf:10
bREATHE IN... bREATHE IN...
----- -----
c:1:14 set:ac:true set:bwt:2 bspd:270 c:1:14 set:bwt:2 bspd:270
bREATHE OUT... bREATHE OUT...
----- -----
c:1:13 bpal:1 set:ac:true set:bwt:1 c:1:13 bpal:1 set:bwt:1
bREATHE IN... bREATHE IN...
----- -----
c:1:14 set:ac:true set:bwt:2 bspd:300 c:1:14 set:bwt:2 bspd:300
bREATHE OUT...]], bREATHE OUT...]],
basic_breathe, basic_breathe,
[[set:bwt:0 bpal:2 unset:txd:txf:exf:exd c:4:19 [[set:bwt:0 bpal:2 unset:txd:txf:exf:exd:ac c:4:19
gREAT! iT FEELS gREAT! iT FEELS
>NICE TO !SINK INTO >NICE TO !SINK INTO
RELAXATION SO RELAXATION SO
@ -2044,7 +2044,7 @@ FAMILIAR, !THAT SENSE
WORDS IN !TRANCE.]], WORDS IN !TRANCE.]],
basic_breathe, basic_breathe,
basic_breathe, basic_breathe,
[[set:bwt:0 bpal:2 c:8:20 [[set:bwt:0 bpal:2 unset:ac c:8:20
sO #RELAXED NOW, !THAT sO #RELAXED NOW, !THAT
!BODY BARELY WANTS TO !BODY BARELY WANTS TO
>MOVE, !DOESN'T IT? >MOVE, !DOESN'T IT?
@ -2140,10 +2140,10 @@ TO HAVE INTERNAL #AIR
#PRESSURE RESISTING #PRESSURE RESISTING
MOVEMENTS? MOVEMENTS?
----- -----
c:7:19 c:7:20
>bECAUSE WHEN !YOUR >bECAUSE WHEN !YOUR
>PAINTED-ON EYES CAN >PAINTED-ON EYES CAN
?SEE YOUR INFLATABLE >SEE YOUR INFLATABLE
!TOY #ORCA SHAPE RIGHT !TOY #ORCA SHAPE RIGHT
IN FRONT OF YOU, IN FRONT OF YOU,
>THAT !EXPERIENCE !CAN >THAT !EXPERIENCE !CAN