cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-04 22:04:29 +00:00
Code Issues Releases Wiki Activity

random song music in progress

Browse source
This commit is contained in:
Cameron Taylor 2023-08-13 22:12:08 -04:00 committed by EliteMasterEric
parent 8525cfaf21
commit 0dbcc50bcc
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit e5aad64d7b5201d23cd28cf740cff48fae6ebf74 Subproject commit fd8251b139d482146ed79495865a48676a4d1d68

11
source/funkin/FreeplayState.hx
View file

@ -994,6 +994,7 @@ class FreeplayState extends MusicBeatSubState
// NGio.logEvent('Fresh'); // NGio.logEvent('Fresh');
FlxG.sound.play(Paths.sound('scrollMenu'), 0.4); FlxG.sound.play(Paths.sound('scrollMenu'), 0.4);
// FlxG.sound.playMusic(Paths.inst(songs[curSelected].songName));
curSelected += change; curSelected += change;
@ -1034,7 +1035,15 @@ class FreeplayState extends MusicBeatSubState
if (index < curSelected) capsule.targetPos.y -= 100; // another 100 for good measure 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;
}
} }
} }

2
source/funkin/freeplayStuff/SongMenuItem.hx
View file

@ -178,7 +178,7 @@ class SongMenuItem extends FlxSpriteGroup
var xPosLerpLol:Array<Float> = [0.9, 0.4, 0.16, 0.16, 0.22, 0.22, 0.245]; // NUMBERS ARE JANK CUZ THE SCALING OR WHATEVER var xPosLerpLol:Array<Float> = [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<Float> = [0.245, 0.75, 0.98, 0.98, 1.2]; // NUMBERS ARE JANK CUZ THE SCALING OR WHATEVER var xPosOutLerpLol:Array<Float> = [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 public function initJumpIn(maxTimer:Float, ?force:Bool):Void
{ {