gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ugh, I'm NEW

Browse Source
This commit is contained in:
Kolo
2025-08-27 23:19:36 +08:00
committed by Hundrec
parent 9c08a6ce68
commit 3a41b696d3
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/ui/freeplay/FreeplayState.hx
+24 -17
View File
@@ -3048,13 +3048,18 @@ class FreeplaySongData
{
// This looks jank but the haxe compiler is on crack or something so 2 `privateAccess` lines are needed for some reason
@:privateAccess
var song:Null<Song> = SongRegistry.instance.fetchEntry(songId, {variation: instance.currentVariation});
var song:Null<Song> = SongRegistry.instance.fetchEntry(songId, {variation: curVariation});
@:privateAccess
if (song == null) throw 'Song entry not found for id: $songId with variation: ${instance.currentVariation}';
if (song == null) throw 'Song entry not found for id: $songId with variation: ${curVariation}';
return song;
}
/**
* The current variation to use in various property functions.
*/
var curVariation(get, never):String;
/**
* The level id of the song, useful for sorting from week1 -> week 7 + weekend1
* and for properly loading PlayStatePlaylist for preloading on web
@@ -3138,10 +3143,7 @@ class FreeplaySongData
function get_idAndVariation()
{
var variations:Array<String> = data.getVariationsByCharacterId(FreeplayState.rememberedCharacterId);
var variation:Null<String> = data.getFirstValidVariation(FreeplayState.rememberedDifficulty, null, variations);
if (variation == null) variation = Constants.DEFAULT_VARIATION;
return '${data.id}:${variation}';
return '${data.id}:${curVariation}';
}
function get_isFav():Bool
@@ -3153,10 +3155,7 @@ class FreeplaySongData
{
// grabs a specific difficulty's new status. used for the difficulty dots.
var variations:Array<String> = data.getVariationsByCharacterId(FreeplayState.rememberedCharacterId);
var variation:Null<String> = data.getFirstValidVariation(difficulty, null, variations);
if (variation == null) variation = Constants.DEFAULT_VARIATION;
return data.isSongNew(difficulty, variation);
return data.isSongNew(difficulty, curVariation);
}
function get_isNew():Bool
@@ -3166,10 +3165,7 @@ class FreeplaySongData
// it's stored in the song .hxc script in a function that overrides `isSongNew()`
// and is only accessible with the correct valid variation inputs
var variations:Array<String> = data.getVariationsByCharacterId(FreeplayState.rememberedCharacterId);
var variation:Null<String> = data.getFirstValidVariation(FreeplayState.rememberedDifficulty, null, variations);
if (variation == null) variation = Constants.DEFAULT_VARIATION;
return data.isSongNew(FreeplayState.rememberedDifficulty, variation);
return data.isSongNew(FreeplayState.rememberedDifficulty, curVariation);
}
function get_songCharacter():String
@@ -3200,10 +3196,21 @@ class FreeplaySongData
function get_scoringRank():Null<ScoringRank>
{
var variations:Array<String> = data.getVariationsByCharacterId(FreeplayState.rememberedCharacterId);
var variation:Null<String> = data.getFirstValidVariation(FreeplayState.rememberedDifficulty, null, variations);
return Save.instance.getSongRank(data.id, FreeplayState.rememberedDifficulty, curVariation);
}
return Save.instance.getSongRank(data.id, FreeplayState.rememberedDifficulty, variation);
function get_curVariation()
{
// Temporarily fetch the song to check for the first valid variation of it.
// For example if the current character is bf, for songs such as darnell we want to use the 'bf' variation instead of 'normal'.
var song:Null<Song> = SongRegistry.instance.fetchEntry(songId);
if (song == null) throw 'Song entry not found for id: $songId';
var variations:Array<String> = song.getVariationsByCharacterId(FreeplayState.rememberedCharacterId);
var variation:Null<String> = song.getFirstValidVariation(FreeplayState.rememberedDifficulty, null, variations);
if (variation == null) variation = Constants.DEFAULT_VARIATION;
return variation;
}
}