diff --git a/Themes/default/Scripts/03 ThemePrefs.lua b/Themes/default/Scripts/03 ThemePrefs.lua index 4b26acd764..e8dc9260f8 100644 --- a/Themes/default/Scripts/03 ThemePrefs.lua +++ b/Themes/default/Scripts/03 ThemePrefs.lua @@ -234,18 +234,19 @@ function UserPrefShowLotsaOptions() end function UserPrefSpecialScoringMode() + local baseChoices = { 'DDR 1stMIX', 'DDR 4thMIX', 'DDR SuperNOVA', 'DDR SuperNOVA 2' }; --'[SSC] Radar Master' local t = { Name = "UserPrefSpecialScoringMode"; LayoutType = "ShowAllInRow"; SelectType = "SelectOne"; OneChoiceForAllPlayers = true; ExportOnChange = false; - Choices = { 'DDR 1stMIX', 'DDR 4thMIX', 'DDR SuperNOVA', 'DDR SuperNOVA 2' }; --'[SSC] Radar Master' + Choices = baseChoices; LoadSelections = function(self, list, pn) if ReadPrefFromFile("UserPrefSpecialScoringMode") ~= nil then local theValue = ReadPrefFromFile("UserPrefSpecialScoringMode"); local success = false; - for k,v in ipairs(t.Choices) do if v == theValue then list[k] = true success = true break end end; + for k,v in ipairs(baseChoices) do if v == theValue then list[k] = true success = true break end end; if success == false then list[1] = true end; else WritePrefToFile("UserPrefSpecialScoringMode", 'DDR 1stMIX'); @@ -253,7 +254,7 @@ function UserPrefSpecialScoringMode() end; end; SaveSelections = function(self, list, pn) - for k,v in ivalues(list) do if v then WritePrefToFile("UserPrefSpecialScoringMode", t.Choices[k]) break end end; + for k,v in ipairs(list) do if v then WritePrefToFile("UserPrefSpecialScoringMode", baseChoices[k]) break end end; end; }; setmetatable( t, t ); diff --git a/Themes/default/Scripts/04 SpecialScoring.lua b/Themes/default/Scripts/04 SpecialScoring.lua index a815f5079c..09280b2912 100644 --- a/Themes/default/Scripts/04 SpecialScoring.lua +++ b/Themes/default/Scripts/04 SpecialScoring.lua @@ -19,7 +19,7 @@ r['DDR 4thMIX'] = function(params, pss) local scoreLookupTable = { ['TapNoteScore_W1']=777, ['TapNoteScore_W2']=777, ['TapNoteScore_W3']=555 }; setmetatable(scoreLookupTable, ZeroIfNotFound); local comboBonusForThisStep = (pss:GetCurrentCombo()+1)*333; - pss:SetScore(pss:GetScore()+scoreLookupTable[params.TapNoteScore]+comboBonusForThisStep); + pss:SetScore(pss:GetScore()+scoreLookupTable[params.TapNoteScore]+(scoreLookupTable[params.TapNoteScore] and comboBonusForThisStep or 0)); end; ----------------------------------------------------------- --DDR SuperNOVA(-esque) scoring @@ -39,6 +39,7 @@ r['DDR SuperNOVA 2'] = function(params, pss) end; ----------------------------------------------------------- --Radar Master (doesn't work in 1.2, disabled) +--don't try to "fix it up", either. you *cannot* make it work in 1.2. ----------------------------------------------------------- --[[r['[SSC] Radar Master'] = function(params, pss) local masterTable = {