mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-11-15 11:22:55 +00:00
Merge branch 'applehair/ranks-for-custom-variations' into feature/playable-pico-mode
This commit is contained in:
commit
fbfd8259a6
4
.gitmodules
vendored
4
.gitmodules
vendored
|
@ -1,6 +1,6 @@
|
||||||
[submodule "assets"]
|
[submodule "assets"]
|
||||||
path = assets
|
path = assets
|
||||||
url = https://github.com/FunkinCrew/Funkin-Assets-secret
|
url = https://github.com/FunkinCrew/funkin.assets
|
||||||
[submodule "art"]
|
[submodule "art"]
|
||||||
path = art
|
path = art
|
||||||
url = https://github.com/FunkinCrew/Funkin-Art-secret
|
url = https://github.com/FunkinCrew/funkin.art
|
||||||
|
|
|
@ -2154,7 +2154,12 @@ class FreeplaySongData
|
||||||
this.albumId = songDifficulty.album;
|
this.albumId = songDifficulty.album;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.scoringRank = Save.instance.getSongRank(songId, currentDifficulty);
|
// 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, suffixedDifficulty);
|
||||||
|
|
||||||
this.isNew = song.isSongNew(currentDifficulty);
|
this.isNew = song.isSongNew(currentDifficulty);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue