cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-11 20:57:20 +00:00
Code Issues Releases Wiki Activity

Merge pull request #473 from FunkinCrew/bugfix/additional-fixins

Browse source 
Bugfix/additional fixins
This commit is contained in:
Cameron Taylor 2024-04-09 23:50:23 -04:00 committed by GitHub
parent 54496c400b 5f48ca82bd
commit 5e7d21d43a
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 0782d868ba8379d699ef9ab9547c3507580628e2 Subproject commit 732bfcb6400c5e788712639c7420160c03475452

22
source/funkin/play/PlayState.hx
View file

@ -2786,7 +2786,7 @@ class PlayState extends MusicBeatSubState
// adds current song data into the tallies for the level (story levels) // adds current song data into the tallies for the level (story levels)
Highscore.talliesLevel = Highscore.combineTallies(Highscore.tallies, Highscore.talliesLevel); Highscore.talliesLevel = Highscore.combineTallies(Highscore.tallies, Highscore.talliesLevel);
if (Save.instance.isSongHighScore(currentSong.id, currentDifficulty, data)) if (!isPracticeMode && !isBotPlayMode && Save.instance.isSongHighScore(currentSong.id, currentDifficulty, data))
{ {
Save.instance.setSongScore(currentSong.id, currentDifficulty, data); Save.instance.setSongScore(currentSong.id, currentDifficulty, data);
#if newgrounds #if newgrounds
@ -3072,18 +3072,18 @@ class PlayState extends MusicBeatSubState
title: PlayStatePlaylist.isStoryMode ? ('${PlayStatePlaylist.campaignTitle}') : ('${currentChart.songName} by ${currentChart.songArtist}'), title: PlayStatePlaylist.isStoryMode ? ('${PlayStatePlaylist.campaignTitle}') : ('${currentChart.songName} by ${currentChart.songArtist}'),
scoreData: scoreData:
{ {
score: songScore, score: PlayStatePlaylist.isStoryMode ? PlayStatePlaylist.campaignScore : songScore,
tallies: tallies:
{ {
sick: Highscore.tallies.sick, sick: talliesToUse.sick,
good: Highscore.tallies.good, good: talliesToUse.good,
bad: Highscore.tallies.bad, bad: talliesToUse.bad,
shit: Highscore.tallies.shit, shit: talliesToUse.shit,
missed: Highscore.tallies.missed, missed: talliesToUse.missed,
combo: Highscore.tallies.combo, combo: talliesToUse.combo,
maxCombo: Highscore.tallies.maxCombo, maxCombo: talliesToUse.maxCombo,
totalNotesHit: Highscore.tallies.totalNotesHit, totalNotesHit: talliesToUse.totalNotesHit,
totalNotes: Highscore.tallies.totalNotes, totalNotes: talliesToUse.totalNotes,
}, },
accuracy: Highscore.tallies.totalNotesHit / Highscore.tallies.totalNotes, accuracy: Highscore.tallies.totalNotesHit / Highscore.tallies.totalNotes,
}, },