From 0edf7f30e6dd678bf323380b5c5de5014b752fd9 Mon Sep 17 00:00:00 2001 From: Flameshadowxeroshin Date: Thu, 6 Jan 2011 20:06:44 -0600 Subject: [PATCH 1/2] radar master axed for 1.2. --- Themes/default/Scripts/03 ThemePrefs.lua | 2 +- Themes/default/Scripts/04 SpecialScoring.lua | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) 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; From 5231800e93b7e67d9112ad880c4c46288cd6f2d5 Mon Sep 17 00:00:00 2001 From: Flameshadowxeroshin Date: Thu, 6 Jan 2011 20:27:41 -0600 Subject: [PATCH 2/2] fixes for some minor specialscoring issues. selector should work, it should save, etc. --- Themes/default/Scripts/03 ThemePrefs.lua | 7 ++++--- Themes/default/Scripts/04 SpecialScoring.lua | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) 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 = {