Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-23 08:07:54 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #505 from FunkinCrew/bugfix/tuesday-fixes

Browse source 
Bugfix/tuesday fixes
This commit is contained in:
Cameron Taylor 2024-04-24 11:46:47 -04:00 committed by GitHub
commit 7087b6de6f
5 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.prettierignore
View file

@ -9,3 +9,5 @@ assets/weekend1/images
# Don't ignore data files # Don't ignore data files
# TODO: These don't work. # TODO: These don't work.
!assets/preload/data/ !assets/preload/data/
assets/exclude/data/credits.json

2
assets

@ -1 +1 @@
Subproject commit 3f3977d7bf82856106e9c74fa11433c67b160323 Subproject commit 0e07811217c579df376719c76d47c1e08b3070e2

13
source/funkin/play/song/Song.hx
View file

@ -609,28 +609,33 @@ class SongDifficulty
return cast events; return cast events;
} }
public function cacheInst(instrumental = ''):Void public function getInstPath(instrumental = ''):String
{ {
if (characters != null) if (characters != null)
{ {
if (instrumental != '' && characters.altInstrumentals.contains(instrumental)) if (instrumental != '' && characters.altInstrumentals.contains(instrumental))
{ {
var instId = '-$instrumental'; var instId = '-$instrumental';
FlxG.sound.cache(Paths.inst(this.song.id, instId)); return Paths.inst(this.song.id, instId);
} }
else else
{ {
// Fallback to default instrumental. // Fallback to default instrumental.
var instId = (characters.instrumental ?? '') != '' ? '-${characters.instrumental}' : ''; var instId = (characters.instrumental ?? '') != '' ? '-${characters.instrumental}' : '';
FlxG.sound.cache(Paths.inst(this.song.id, instId)); return Paths.inst(this.song.id, instId);
} }
} }
else else
{ {
FlxG.sound.cache(Paths.inst(this.song.id)); return Paths.inst(this.song.id);
} }
} }
public function cacheInst(instrumental = ''):Void
{
FlxG.sound.cache(getInstPath(instrumental));
}
public function playInst(volume:Float = 1.0, looped:Bool = false):Void public function playInst(volume:Float = 1.0, looped:Bool = false):Void
{ {
var suffix:String = (variation != null && variation != '' && variation != 'default') ? '-$variation' : ''; var suffix:String = (variation != null && variation != '' && variation != 'default') ? '-$variation' : '';

4
source/funkin/ui/credits/CreditsState.hx
View file

@ -185,7 +185,7 @@ class CreditsState extends MusicBeatState
} }
else if (controls.PAUSE) else if (controls.PAUSE)
{ {
scrollPaused = !scrollPaused; // scrollPaused = !scrollPaused;
} }
} }
@ -196,7 +196,7 @@ class CreditsState extends MusicBeatState
function exit():Void function exit():Void
{ {
FlxG.switchState(new funkin.ui.mainmenu.MainMenuState()); FlxG.switchState(funkin.ui.mainmenu.MainMenuState.new);
} }
public override function destroy():Void public override function destroy():Void

2
source/funkin/ui/transition/LoadingState.hx
View file

@ -77,7 +77,7 @@ class LoadingState extends MusicBeatSubState
var difficulty:String = playParams.targetDifficulty ?? Constants.DEFAULT_DIFFICULTY; var difficulty:String = playParams.targetDifficulty ?? Constants.DEFAULT_DIFFICULTY;
var variation:String = playParams.targetVariation ?? Constants.DEFAULT_VARIATION; var variation:String = playParams.targetVariation ?? Constants.DEFAULT_VARIATION;
var targetChart:SongDifficulty = playParams.targetSong?.getDifficulty(difficulty, variation); var targetChart:SongDifficulty = playParams.targetSong?.getDifficulty(difficulty, variation);
var instPath:String = Paths.inst(targetChart.song.id); var instPath:String = targetChart.getInstPath(playParams.targetInstrumental);
var voicesPaths:Array<String> = targetChart.buildVoiceList(); var voicesPaths:Array<String> = targetChart.buildVoiceList();
checkLoadSong(instPath); checkLoadSong(instPath);