From 0dbcc50bccb9b84ed03b2fe6a3be9846816f9585 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Sun, 13 Aug 2023 22:12:08 -0400 Subject: [PATCH] random song music in progress --- assets | 2 +- source/funkin/FreeplayState.hx | 11 ++++++++++- source/funkin/freeplayStuff/SongMenuItem.hx | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/assets b/assets index e5aad64d7..fd8251b13 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit e5aad64d7b5201d23cd28cf740cff48fae6ebf74 +Subproject commit fd8251b139d482146ed79495865a48676a4d1d68 diff --git a/source/funkin/FreeplayState.hx b/source/funkin/FreeplayState.hx index 5e3e896e2..99f12bcb0 100644 --- a/source/funkin/FreeplayState.hx +++ b/source/funkin/FreeplayState.hx @@ -994,6 +994,7 @@ class FreeplayState extends MusicBeatSubState // NGio.logEvent('Fresh'); FlxG.sound.play(Paths.sound('scrollMenu'), 0.4); + // FlxG.sound.playMusic(Paths.inst(songs[curSelected].songName)); curSelected += change; @@ -1034,7 +1035,15 @@ class FreeplayState extends MusicBeatSubState if (index < curSelected) capsule.targetPos.y -= 100; // another 100 for good measure } - if (grpCapsules.countLiving() > 0) grpCapsules.members[curSelected].selected = true; + if (grpCapsules.countLiving() > 0) + { + if (curSelected == 0) + { + FlxG.sound.playMusic(Paths.music('freeplay/freeplayRandom'), 0); + FlxG.sound.music.fadeIn(2, 0, 0.8); + } + grpCapsules.members[curSelected].selected = true; + } } } diff --git a/source/funkin/freeplayStuff/SongMenuItem.hx b/source/funkin/freeplayStuff/SongMenuItem.hx index be663af74..c781b8b8d 100644 --- a/source/funkin/freeplayStuff/SongMenuItem.hx +++ b/source/funkin/freeplayStuff/SongMenuItem.hx @@ -178,7 +178,7 @@ class SongMenuItem extends FlxSpriteGroup var xPosLerpLol:Array = [0.9, 0.4, 0.16, 0.16, 0.22, 0.22, 0.245]; // NUMBERS ARE JANK CUZ THE SCALING OR WHATEVER var xPosOutLerpLol:Array = [0.245, 0.75, 0.98, 0.98, 1.2]; // NUMBERS ARE JANK CUZ THE SCALING OR WHATEVER - public final realScaled:Float = 0.8; + public var realScaled:Float = 0.8; public function initJumpIn(maxTimer:Float, ?force:Bool):Void {