small formatting changes to scoring lua file

This commit is contained in:
AJ Kelly
2012-03-24 00:02:24 -05:00
parent 71084e7b2e
commit b69a985e6b
+17 -6
View File
@@ -502,8 +502,8 @@ r["3.9Plus SN2"] = function(params, pss)
end;
-----------------------------------------------------------
--Oldschool scoring, best described as a modified 4th mix scheme
--with a little 1st mix influence
-- Oldschool scoring, best described as a modified 4th mix
-- scheme with a little 1st mix influence
-----------------------------------------------------------
r['Oldschool'] = function(params, pss)
local bestPoints = 999
@@ -755,7 +755,8 @@ r['DDR SuperNOVA 2'] = function(params, pss)
end;
-----------------------------------------------------------
--Radar Master (disabled; todo: get this working with StepMania 5)
-- Radar Master (disabled)
-- (todo: get this working with StepMania 5)
-----------------------------------------------------------
r['[SSC] Radar Master'] = function(params, pss)
local masterTable = {
@@ -776,7 +777,7 @@ r['[SSC] Radar Master'] = function(params, pss)
totalRadar = totalRadar + firstRadar;
end;
end;
--two loops are needed because we need to calculate totalRadar
-- two loops are needed, because we need to calculate totalRadar
-- to actually calculate any part of the score
for k,v in pairs(masterTable) do
local curPortion = pss:GetRadarActual():GetValue(k) / v;
@@ -784,6 +785,7 @@ r['[SSC] Radar Master'] = function(params, pss)
end;
pss:SetScore(finalScore);
end;
------------------------------------------------------------
-- Marvelous Incorporated Grading System (or MIGS for short)
-- basically like DP scoring with locked DP values
@@ -813,8 +815,10 @@ r['Billions DP']= function(params,pss)
pss:SetScore(math.floor((pss:GetActualDancePoints()/poss)*1000000000))
pss:SetCurMaxScore(math.floor((pss:GetCurrentPossibleDancePoints()/poss)*1000000000))
end
-------------------------------------------------------------------------------
-- Formulas end here.
for v in ivalues(DisabledScoringModes) do r[v] = nil end
Scoring = r;
@@ -834,10 +838,15 @@ function UserPrefScoringMode()
--Load the saved scoring mode from UserPrefs.
local theValue = ReadPrefFromFile("UserPrefScoringMode");
local success = false;
--HACK: Preview 4 took out 1st and 4th scoring. Replace with a close equivalent.
if theValue == "DDR 1stMIX" or theValue == "DDR 4thMIX" then theValue = "Oldschool" end
--Search the list of scoring modes for the saved scoring mode.
for k,v in ipairs(baseChoices) 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;
--We couldn't find it, pick the first available scoring mode as a sane default.
if success == false then list[1] = true end;
else
@@ -846,7 +855,9 @@ function UserPrefScoringMode()
end;
end;
SaveSelections = function(self, list, pn)
for k,v in ipairs(list) do if v then WritePrefToFile("UserPrefScoringMode", baseChoices[k]) break end end;
for k,v in ipairs(list) do
if v then WritePrefToFile("UserPrefScoringMode", baseChoices[k]) break end
end;
end;
};
setmetatable( t, t );