diff --git a/Themes/default/Scripts/03 ThemePrefs.lua b/Themes/default/Scripts/03 ThemePrefs.lua index 68dea80356..6dae14bd73 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 3rdMIX', 'DDR 4thMIX', 'DDR SuperNOVA', 'DDR SuperNOVA 2' }; + Choices = { 'DDR 1stMIX', 'DDR 4thMIX', 'DDR SuperNOVA', 'DDR SuperNOVA 2' }; 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 02c373223d..fea72b06ff 100644 --- a/Themes/default/Scripts/04 SpecialScoring.lua +++ b/Themes/default/Scripts/04 SpecialScoring.lua @@ -13,20 +13,6 @@ r['DDR 1stMIX'] = function(params, pss) pss:SetScore(pss:GetScore()+(bScore*multLookup[params.TapNoteScore])); end; ----------------------------------------------------------- ---DDR 3rd Mix and USA Scoring ------------------------------------------------------------ -r['DDR 3rdMIX'] = function(params, pss) - local totalSteps = pss:GetRadarPossible():GetValue('RadarCategory_TapsAndHolds'); - if totalSteps == 0 then pss:SetScore(0) return nil end - local baseScore = math.round(1000000/((totalSteps*(totalSteps+1))/2)); - local curStep = pss:GetRadarActual():GetValue('RadarCategory_TapsAndHolds'); - local endBonus = (curStep == totalSteps) and (1000000-math.round(1000000/(totalSteps*(totalSteps+1)/2))*(totalSteps*(totalSteps+1)/2)) or 0; - local multLookup = { ['TapNoteScore_W1']=10, ['TapNoteScore_W2']=10, ['TapNoteScore_W3']=5 }; - setmetatable(multLookup, ZeroIfNotFound); - local thisScore = multLookup[params.TapNoteScore] * (baseScore * curStep + endBonus); - pss:SetScore(pss:GetScore()+thisScore); -end; ------------------------------------------------------------ --DDR 4th Mix/Extra Mix/Konamix/GB3/DDRPC Scoring ----------------------------------------------------------- r['DDR 4thMIX'] = function(params, pss)