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

Merge branch 'rewrite/master' into bugfix/doppel-random

Browse source
This commit is contained in:
Cameron Taylor 2024-09-09 23:50:00 -04:00
parent 4c1b4859e7 030afe1355
commit 06389cb5cd
2 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hmm.json
View file

@ -46,7 +46,7 @@
"name": "flxanimate", "name": "flxanimate",
"type": "git", "type": "git",
"dir": null, "dir": null,
"ref": "280d1a46ac60021d08bb18181631cbd6d061782c", "ref": "0654797e5eb7cd7de0c1b2dbaa1efe5a1e1d9412",
"url": "https://github.com/Dot-Stuff/flxanimate" "url": "https://github.com/Dot-Stuff/flxanimate"
}, },
{ {

16
source/funkin/ui/freeplay/FreeplayState.hx
View file

@ -1985,22 +1985,6 @@ class FreeplayState extends MusicBeatSubState
return; return;
} }
var baseInstrumentalId:String = targetSong?.getBaseInstrumentalId(targetDifficultyId, targetDifficulty.variation ?? Constants.DEFAULT_VARIATION) ?? '';
var altInstrumentalIds:Array<String> = targetSong?.listAltInstrumentalIds(targetDifficultyId,
targetDifficulty.variation ?? Constants.DEFAULT_VARIATION) ?? [];
var targetInstId:String = baseInstrumentalId;
// TODO: Make this a UI element.
#if FEATURE_DEBUG_FUNCTIONS
if (altInstrumentalIds.length > 0 && FlxG.keys.pressed.CONTROL)
{
targetInstId = altInstrumentalIds[0];
}
if (targetInstId == null) targetInstId = baseInstrumentalId;
#end
// Visual and audio effects. // Visual and audio effects.
FunkinSound.playOnce(Paths.sound('confirmMenu')); FunkinSound.playOnce(Paths.sound('confirmMenu'));
if (dj != null) dj.confirm(); if (dj != null) dj.confirm();