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

Merge branch 'applehair/ranks-for-custom-variations' into feature/playable-pico-mode

Browse source
This commit is contained in:
EliteMasterEric 2024-06-27 04:06:10 -04:00
parent 9b3a748f37 1f1fe62a06
commit fbfd8259a6
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -1,6 +1,6 @@
[submodule "assets"]
path = assets
url = https://github.com/FunkinCrew/Funkin-Assets-secret
url = https://github.com/FunkinCrew/funkin.assets
[submodule "art"]
path = art
url = https://github.com/FunkinCrew/Funkin-Art-secret
url = https://github.com/FunkinCrew/funkin.art

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

@ -2153,8 +2153,13 @@ class FreeplaySongData
{
this.albumId = songDifficulty.album;
}
// TODO: This line of code makes me sad, but you can't really fix it without a breaking migration.
// `easy`, `erect`, `normal-pico`, etc.
var suffixedDifficulty = (songDifficulty.variation != Constants.DEFAULT_VARIATION
&& songDifficulty.variation != 'erect') ? '$currentDifficulty-${songDifficulty.variation}' : currentDifficulty;
this.scoringRank = Save.instance.getSongRank(songId, currentDifficulty);
this.scoringRank = Save.instance.getSongRank(songId, suffixedDifficulty);
this.isNew = song.isSongNew(currentDifficulty);
}