From bd03f0ad5ce75a43f1b4f19120e5ffcabd76e62f Mon Sep 17 00:00:00 2001 From: Kistaro Windrider Date: Sun, 18 Feb 2024 12:38:52 -0800 Subject: [PATCH] suppress next-pane sound on autoconfirm if the sound was whooshier I'd keep it in the autoadvancing breathers, but it's a computerized bloop and I can't make it whooshy, so now I am distinctly recognizing autoconfirm so I can suppress it. yay --- vacation.p8 | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/vacation.p8 b/vacation.p8 index 08e7675..60f8eba 100644 --- a/vacation.p8 +++ b/vacation.p8 @@ -835,6 +835,7 @@ function fadetbl(col, tbl, frac) end function zonk_mode:update() + self.confirmed = self.confirmed or self.ac if (not self.brth:matches(self.bwt)) self.alwaysmatched=false if self.playing_text then self.twt -= 1 @@ -843,7 +844,7 @@ function zonk_mode:update() if not item then if (not self.file or #self.file == 0) self:next_file() self.playing_text=false - psound(8,8,2) + if (not self.confirmed) psound(8,8,2) else self.txt_frame:push(item) self.twt = wt*self.cmul @@ -864,7 +865,7 @@ function zonk_mode:update() self.txt_frame.go = true self.fpfrm = self.exf self.alwaysmatched=true - psound(8, justc and 16 or 18, 8, true) + if (not self.ac) psound(8, justc and 16 or 18, 8, true) end if (justc and not self.nextpage) psound(8,16,2) else @@ -932,19 +933,19 @@ bpal:1 set:bwt:2 c:3:19 FULLY ALERT AT THE >COUNT OF #5... ----- -set:exf:10 set:txf:30 set:txd:45 set:confirmed:1 bgdy:0.1 bspd:225 c:1:1 +set:exf:10 set:txf:30 set:txd:45 set:ac:1 bgdy:0.1 bspd:225 c:1:1 1 ----- -set:confirmed:1 bspd:210 bgdy:0.15 bgwt:10 c:1:1 +set:ac:1 bspd:210 bgdy:0.15 bgwt:10 c:1:1 2 ----- -set:confirmed:1 bspd:180 bgdy:0.2 bgwt:12 c:1:1 +set:ac:1 bspd:180 bgdy:0.2 bgwt:12 c:1:1 3 ----- -set:confirmed:1 bgdy:0.25 bpal:2 bgwt:14 c:1:1 +set:ac:1 bgdy:0.25 bpal:2 bgwt:14 c:1:1 4 ----- -set:confirmed:1 bgdy:0.4 bgwt:16 c:1:1 +set:ac:1 bgdy:0.4 bgwt:16 c:1:1 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 @@ -1785,10 +1786,10 @@ DRIFT,SOAR,IMAGINE,BE RELAX,CHILL,TOY,POOLTOY SINK,DEEP,TRANCE,FOLLOW]] -basic_breathe=[[c:1:13 bon set:confirmed:true set:bwt:1 +basic_breathe=[[c:1:13 bon set:ac:true set:bwt:1 bREATHE IN... ----- -c:1:14 set:confirmed:true set:bwt:2 +c:1:14 set:ac:true set:bwt:2 bREATHE OUT...]] function sequencer:next() @@ -1935,16 +1936,16 @@ tHAT ALL SOUNDS LIKE YOU NEED TO DO RIGHT !NOW IS TO #BREATHE. ----- -c:1:13 bon bpal:1 set:confirmed:true set:bwt:1 set:txf:2 set:txd:0 set:exd:0 set:exf:10 +c:1:13 bon bpal:1 set:ac:true set:bwt:1 set:txf:2 set:txd:0 set:exd:0 set:exf:10 bREATHE IN... ----- -c:1:14 set:confirmed:true set:bwt:2 bspd:270 +c:1:14 set:ac:true set:bwt:2 bspd:270 bREATHE OUT... ----- -c:1:13 bpal:1 set:confirmed:true set:bwt:1 +c:1:13 bpal:1 set:ac:true set:bwt:1 bREATHE IN... ----- -c:1:14 set:confirmed:true set:bwt:2 bspd:300 +c:1:14 set:ac:true set:bwt:2 bspd:300 bREATHE OUT...]], basic_breathe, [[set:bwt:0 bpal:2 unset:txd:txf:exf:exd c:4:19