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

easy / hard fixed i think for freeplay

Browse source
This commit is contained in:
Cameron Taylor 2021-12-06 20:35:15 -05:00
parent f4a02cb5f1
commit bbc22483f1
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/FreeplayState.hx
View file

@ -527,7 +527,7 @@ class FreeplayState extends MusicBeatSubstate
{ {
// if (Assets.exists()) // if (Assets.exists())
var poop:String = Highscore.formatSong(songs[curSelected].songName.toLowerCase(), curDifficulty); var poop:String = songs[curSelected].songName.toLowerCase();
// does not work properly, always just accidentally sets it to normal anyways! // does not work properly, always just accidentally sets it to normal anyways!
/* if (!Assets.exists(Paths.json(songs[curSelected].songName + '/' + poop))) /* if (!Assets.exists(Paths.json(songs[curSelected].songName + '/' + poop)))
@ -543,10 +543,20 @@ class FreeplayState extends MusicBeatSubstate
PlayState.isStoryMode = false; PlayState.isStoryMode = false;
PlayState.storyDifficulty = curDifficulty; PlayState.storyDifficulty = curDifficulty;
// SongLoad.curDiff = Highscore.formatSong() // SongLoad.curDiff = Highscore.formatSong()
SongLoad.curDiff = 'normal';
SongLoad.curDiff = switch (curDifficulty)
{
case 0:
'easy';
case 1:
'normal';
case 2:
'hard';
default: 'normal';
};
PlayState.storyWeek = songs[curSelected].week; PlayState.storyWeek = songs[curSelected].week;
trace('CUR WEEK' + PlayState.storyWeek); trace(' CUR WEEK ' + PlayState.storyWeek);
LoadingState.loadAndSwitchState(new PlayState()); LoadingState.loadAndSwitchState(new PlayState());
} }
} }
@ -577,7 +587,7 @@ class FreeplayState extends MusicBeatSubstate
positionHighscore(); positionHighscore();
} }
// Clears the cache of songs, frees up memory, they'll have to be loaded in later tho // Clears the cache of songs, frees up memory, they' ll have to be loaded in later tho function clearDaCache(actualSongTho:String)
function clearDaCache(actualSongTho:String) function clearDaCache(actualSongTho:String)
{ {
for (song in songs) for (song in songs)

1
source/SongLoad.hx
View file

@ -112,7 +112,6 @@ class SongLoad
public static function parseJSONshit(rawJson:String):SwagSong public static function parseJSONshit(rawJson:String):SwagSong
{ {
var swagShit:SwagSong = cast Json.parse(rawJson).song; var swagShit:SwagSong = cast Json.parse(rawJson).song;
trace(swagShit);
swagShit.validScore = true; swagShit.validScore = true;
trace("SONG SHIT ABOUTTA WEEK AGOOO"); trace("SONG SHIT ABOUTTA WEEK AGOOO");