diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua index 7c51c86578..97ed10a6dc 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua @@ -63,7 +63,7 @@ local t = Def.ActorFrame{ if GAMESTATE:GetCurrentSong() ~= nil then hsTable = getScoresByKey(pn) if hsTable ~= nil and hsTable[1] ~= nil then - rtTable = SortScores(getRateTable(hsTable)) + rtTable = getRateTable(hsTable) rates,rateIndex = getUsedRates(rtTable) scoreIndex = 1 score = rtTable[rates[rateIndex]][scoreIndex] diff --git a/Themes/Til Death/Scripts/Scores.lua b/Themes/Til Death/Scripts/Scores.lua index d80cb2286c..a2fd0a8a1b 100644 --- a/Themes/Til Death/Scripts/Scores.lua +++ b/Themes/Til Death/Scripts/Scores.lua @@ -289,8 +289,8 @@ end -- Rate filter stuff -- local function scoreComparator(scoreA,scoreB) - local a = GetWifeScoreOrConvertFromDP(scoreA,sortScoreType) - local b = GetWifeScoreOrConvertFromDP(scoreB,sortScoreType) + local a = GetWifeScoreOrConvertFromDP(scoreA) + local b = GetWifeScoreOrConvertFromDP(scoreB) if a == b then return scoreA:GetWifeScore() > scoreB:GetWifeScore() end diff --git a/src/HighScore.cpp b/src/HighScore.cpp index de7a093331..972457ebfb 100644 --- a/src/HighScore.cpp +++ b/src/HighScore.cpp @@ -712,12 +712,12 @@ float HighScore::ConvertDpToWife() { float ts = 1.f; float estpoints = 0.f; float maxpoints = 0.f; - estpoints += m_Impl->iTapNoteScores[TNS_W1] * wife2(.002249f, ts); - estpoints += m_Impl->iTapNoteScores[TNS_W2] * wife2(.004499f, ts); - estpoints += m_Impl->iTapNoteScores[TNS_W3] * wife2(.008999f, ts); - estpoints += m_Impl->iTapNoteScores[TNS_W4] * wife2(.013499f, ts); - estpoints += m_Impl->iTapNoteScores[TNS_W5] * wife2(.017999f, ts); - estpoints += m_Impl->iTapNoteScores[TNS_Miss] * wife2(.017999f, ts); + estpoints += m_Impl->iTapNoteScores[TNS_W1] * wife2(.02249f, ts); + estpoints += m_Impl->iTapNoteScores[TNS_W2] * wife2(.04499f, ts); + estpoints += m_Impl->iTapNoteScores[TNS_W3] * wife2(.08999f, ts); + estpoints += m_Impl->iTapNoteScores[TNS_W4] * wife2(.13499f, ts); + estpoints += m_Impl->iTapNoteScores[TNS_W5] * wife2(.17999f, ts); + estpoints += m_Impl->iTapNoteScores[TNS_Miss] * wife2(.17999f, ts); FOREACH_ENUM(TapNoteScore, tns) maxpoints += 2 * m_Impl->iTapNoteScores[tns];