diff --git a/Themes/default/Scripts/03 ThemePrefs.lua b/Themes/default/Scripts/03 ThemePrefs.lua index 5dd959d7b9..4b26acd764 100644 --- a/Themes/default/Scripts/03 ThemePrefs.lua +++ b/Themes/default/Scripts/03 ThemePrefs.lua @@ -240,7 +240,7 @@ function UserPrefSpecialScoringMode() SelectType = "SelectOne"; OneChoiceForAllPlayers = true; ExportOnChange = false; - Choices = { 'DDR 1stMIX', 'DDR 4thMIX', 'DDR SuperNOVA', 'DDR SuperNOVA 2', '[SSC] Radar Master' }; + Choices = { 'DDR 1stMIX', 'DDR 4thMIX', 'DDR SuperNOVA', 'DDR SuperNOVA 2' }; --'[SSC] Radar Master' LoadSelections = function(self, list, pn) if ReadPrefFromFile("UserPrefSpecialScoringMode") ~= nil then local theValue = ReadPrefFromFile("UserPrefSpecialScoringMode"); diff --git a/Themes/default/Scripts/04 SpecialScoring.lua b/Themes/default/Scripts/04 SpecialScoring.lua index e61eab6558..a815f5079c 100644 --- a/Themes/default/Scripts/04 SpecialScoring.lua +++ b/Themes/default/Scripts/04 SpecialScoring.lua @@ -38,9 +38,9 @@ r['DDR SuperNOVA 2'] = function(params, pss) pss:SetScore(math.round((pss:GetActualDancePoints()/dp)*100000)*10); end; ----------------------------------------------------------- ---Radar Master +--Radar Master (doesn't work in 1.2, disabled) ----------------------------------------------------------- -r['[SSC] Radar Master'] = function(params, pss) +--[[r['[SSC] Radar Master'] = function(params, pss) local masterTable = { ['RadarCategory_Stream'] = 0, ['RadarCategory_Voltage'] = 0, @@ -51,12 +51,12 @@ r['[SSC] Radar Master'] = function(params, pss) local totalRadar = 0; local finalScore = 0; for k,v in pairs(masterTable) do - local firstRadar = pss:GetRadarPossible():GetValue(k); + local firstRadar = GAMESTATE:GetCurrentSteps(params.Player):GetRadarValues(params.Player):GetValue(k); if firstRadar == 0 then masterTable[k] = nil; else - v = pss:GetRadarPossible():GetValue(k); - totalRadar = totalRadar + v[1]; + masterTable[k] = firstRadar; + totalRadar = totalRadar + firstRadar; end; end; --two loops are needed because we need to calculate totalRadar @@ -66,5 +66,5 @@ r['[SSC] Radar Master'] = function(params, pss) finalScore = finalScore + curPortion*(500000000*(v/totalRadar)); end; pss:SetScore(finalScore); -end; +end;]] SpecialScoring = r;