aboutsummaryrefslogtreecommitdiff
path: root/musicplayer/update_music.lua
diff options
context:
space:
mode:
authorRibbonCable <ambiguousmachine@gmail.com>2022-02-20 12:55:11 -0800
committerRibbonCable <ambiguousmachine@gmail.com>2022-02-20 12:55:11 -0800
commit4f4a5405a95c47b34e0250e6b0f143e8e5f8dc76 (patch)
tree9cfe9651c194db292621e712ee099984a9359aa5 /musicplayer/update_music.lua
parent23acc296abf209ccf2fa15e3641f266b02add71d (diff)
Lots of updates to the music player. Other than track titles and final songs, it's p much done. Also made some sprint non-flipped to save on tokens.
Diffstat (limited to 'musicplayer/update_music.lua')
-rw-r--r--musicplayer/update_music.lua42
1 files changed, 39 insertions, 3 deletions
diff --git a/musicplayer/update_music.lua b/musicplayer/update_music.lua
index e52c663..f0987ae 100644
--- a/musicplayer/update_music.lua
+++ b/musicplayer/update_music.lua
@@ -4,10 +4,46 @@ circletimex = sin(t())*3 -- for elements that move in a circle (respawn timer)
circletimey = cos(t())*3
gt += scrollspeed + 1/600
+fadeouttimer -= ft
updateobjs() --update all objects
-if btnp(0) then tracknumber-=1 playmusic() elseif btnp(1) then tracknumber+=1 playmusic() end
-if btnp(4) and btnp(5) then music(-1,3000,3) end
+if tracknumber < 0 then
+ tracknumber = 4
+elseif tracknumber > 4 then
+ tracknumber = 0
+end
-if tracknumber < 0 then tracknumber = 0 elseif tracknumber > 3 then tracknumber = 3 end \ No newline at end of file
+if btnp(0) then
+ tracknumber-=1
+ updatetracktitlepos()
+ fadeoutsong()
+elseif btnp(1) then
+ tracknumber+=1
+ updatetracktitlepos()
+ fadeoutsong()
+end
+
+if fadeouttimer <= 0 then
+ fadeouttimer = 0
+ selectmusic()
+ updatetracktitlepos()
+end
+
+if autoplay then
+ autoplaytimer -= ft
+ if autoplaytimer <= 0 then
+ autoplaytimer = 90
+ tracknumber+=1
+ fadeoutsong()
+ end
+ autoplaymenutext = "(♪) autoplay"
+else
+ autoplaymenutext = "(◆) autoplay"
+end
+menuitem(2, autoplaymenutext, function() autoplay = not autoplay end)
+
+
+if btnp(4) and btnp(5) then music(-1,3000) end
+
+tracktitleposition = lerp(tracktitleposition,newtracktitleposition,.03) \ No newline at end of file