diff --git a/vacation.p8 b/vacation.p8 index cd58055..d7f6546 100644 --- a/vacation.p8 +++ b/vacation.p8 @@ -702,7 +702,9 @@ function zonk_mode:av() if (type(self.file) == "string") self.file = split(self.file, "\n") if (not self.file) self:nf() assert(self.file) + if (self.bgm) music(self.bgm,1000,7) end + function zonk_mode:nf() if #self.files > 0 then self.file=split(deli(self.files,1), "\n") @@ -817,6 +819,7 @@ function zonk_mode:u() elseif self:ey() then self.txt_frame=blank self.d = ditherer.new{di=0.5} + music(-1,533) else self.nxp = false self.cf=false @@ -829,6 +832,10 @@ function zonk_mode:u() self.brth:u() self.txt_frame:u() if (self.d and self.d:u()) seq:next() + if not self.d and self.nextbgm and not self.xbgm and (not stat(57) or stat(56) == 0) then + music(self.nextbgm, stat(57) and 0 or 500, 7) + self.nextbgm = nil + end end function zonk_mode:draw() @@ -878,13 +885,13 @@ set:exf:10 set:txf:30 set:txd:45 set:ac:1 bgwt:9 bgdy:0.1 bspd:225 c:1:1 bspd:210 bgdy:0.15 bgwt:10 c:1:1 2 ----- -bspd:180 bgdy:0.2 bgwt:11 c:1:1 +bspd:180 bgdy:0.2 bgwt:11 c:1:1 set:nextbgm:21 3 ----- bgdy:0.25 bpal:2 bgwt:12 c:1:1 4 ----- -bgdy:0.3 bgwt:13 c:1:1 +bgdy:0.3 bgwt:13 c:1:1 set:nextbgm:-1 5 ----- 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 @@ -893,6 +900,7 @@ wide awake! function normal_awakener() return zonk_mode.new{ + music=19, br_cols=brth_bg, file=[[c:2:15 bon yOU'VE LEARNED @@ -916,7 +924,7 @@ yOU GET TO TAKE YOUR !MEMORIES OF THIS EXPERIENCE WITH YOU, ----- -c:4:20 bgdy:-0.15 bspd:270 +c:4:20 bgdy:-0.15 bspd:270 set:nextbgm:20 BUT !ALL THE HYPNOTIC !SUGGESTIONS FROM >THIS GAME WILL !FADE @@ -931,6 +939,7 @@ function fast_awakener() {f=awakener_lock}, } return zonk_mode.new{ + xbgm=true, br_speed=240, br_cols=brth_bg, bg_dy=-0.12, @@ -1724,6 +1733,11 @@ bREATHE IN... ----- c:1:14 set:bwt:2 bREATHE OUT...]] +crescendo_breathe=[[c:1:13 set:bwt:1 set:nextbgm:19 +bREATHE IN... +----- +c:1:14 set:bwt:2 +bREATHE OUT...]] function sequencer:next() if (mainview.score) self.score += mainview.score @@ -1828,6 +1842,7 @@ SINK,DEEP,TRANCE,FOLLOW]], txd=8, txf=15, exf=30, + bgm=16, br_spd = 240, files={[[c:3:18 hEY, WELCOME BACK! @@ -1874,7 +1889,7 @@ tHAT ALL SOUNDS LIKE YOU NEED TO DO RIGHT !NOW IS TO #BREATHE. ----- -c:1:13 bon bpal:1 set:ac:1 set:bwt:1 set:txf:4 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 set:nextbgm:17 bREATHE IN... ----- c:1:14 set:bwt:2 bspd:270 @@ -1966,7 +1981,9 @@ SINK,DEEP,TRANCE,FOLLOW,FANTASIZE]], }, { f=zonk_mode.new, - params={{files={ + params={{ + bgm=17, + files={ [[c:4:19 >dON'T THOSE LEVELS >JUST #FLY BY WHEN @@ -2003,7 +2020,7 @@ FAMILIAR, !THAT SENSE #RESPONSES TO THESE WORDS IN !TRANCE.]], basic_breathe, - basic_breathe, + crescendo_breathe, [[set:bwt:0 bpal:2 unset:ac c:8:20 sO #RELAXED NOW, !THAT !BODY BARELY WANTS TO @@ -2124,7 +2141,9 @@ DEEP,TRANCE,PLASTIC,HYPNOSIS,SENSE]], }, { f=zonk_mode.new, - params={{files={ + params={{ + music=17, + files={ [[c:3:19 >yOU'RE DEFINITELY GETTING A !FEEL FOR @@ -2146,6 +2165,7 @@ c:5:20 set:bwt:2 bpal:1 !GOOD AT #SHIFTING A >PERSON'S !MINDSET.]], basic_breathe, + crescendo_breathe, [[unset:ac set:bwt:0 bpal:2 c:7:18 a TOY IS AN #OBJECT TO BE #PLAYED #WITH. @@ -2240,11 +2260,14 @@ DEEP,SINK,PLIANT,AUTOMATIC,HOLLOW]] }, { f=zonk_mode.new, - params={{files={ + params={{ + music=19, + files={ [[c:1:16 bon bpal:1 -sUCH A #GOOD #TOY! ------ -c:5:19 bpal:2 +sUCH A #GOOD #TOY!]], +basic_breathe, +basic_breathe, +[[c:5:19 bpal:2 rEMINDING A !SQUASHY !VINYL !THING THAT IT IS A #"GOOD #TOY" CAN @@ -2660,7 +2683,7 @@ __map__ __sfx__ 950100003565035650356503565035610356103561035610356103561035610356100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 0c0100003065030610306103061000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0f1000010d21000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0e1000010d21000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 0f1000010c21000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 @@ -2718,4 +2741,6 @@ __music__ 03 22232444 03 22252544 03 22252644 +03 41252644 +03 41232444