cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-12 05:07:06 +00:00
Code Issues Releases Wiki Activity

Fix merge conflicts in FreeplayState

Browse source
This commit is contained in:
EliteMasterEric 2023-11-01 23:20:47 -04:00
parent 4b92c145b4
commit 0dd9ba7fd2
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/funkin/FreeplayState.hx
View file

@ -979,8 +979,7 @@ class FreeplayState extends MusicBeatSubState
PlayStatePlaylist.isStoryMode = false; PlayStatePlaylist.isStoryMode = false;
var songId:String = cap.songTitle.toLowerCase(); var targetSong:Song = SongRegistry.instance.fetchEntry(cap.songData.songId);
var targetSong:Song = SongRegistry.instance.fetchEntry(songId);
var targetDifficulty:String = currentDifficulty; var targetDifficulty:String = currentDifficulty;
// TODO: Implement Pico into the interface properly. // TODO: Implement Pico into the interface properly.
@ -1040,25 +1039,14 @@ class FreeplayState extends MusicBeatSubState
if (curSelected < 0) curSelected = grpCapsules.countLiving() - 1; if (curSelected < 0) curSelected = grpCapsules.countLiving() - 1;
if (curSelected >= grpCapsules.countLiving()) curSelected = 0; if (curSelected >= grpCapsules.countLiving()) curSelected = 0;
var targetDifficulty:String = switch (curDifficulty)
{
case 0:
'easy';
case 1:
'normal';
case 2:
'hard';
default: 'normal';
};
var daSongCapsule = grpCapsules.members[curSelected]; var daSongCapsule = grpCapsules.members[curSelected];
if (daSongCapsule.songData != null) if (daSongCapsule.songData != null)
{ {
var songScore:SaveScoreData = Save.get().getSongScore(daSongCapsule.songData.songId, targetDifficulty); var songScore:SaveScoreData = Save.get().getSongScore(daSongCapsule.songData.songId, currentDifficulty);
intendedScore = songScore?.score ?? 0; intendedScore = songScore?.score ?? 0;
intendedCompletion = songScore?.accuracy ?? 0.0; intendedCompletion = songScore?.accuracy ?? 0.0;
diffIdsCurrent = daSong.songDifficulties; diffIdsCurrent = daSongCapsule.songData.songDifficulties;
rememberedSongId = daSong.songId; rememberedSongId = daSongCapsule.songData.songId;
changeDiff(); changeDiff();
} }
else else