fuck why...

This commit is contained in:
Alberto Ramos
2011-01-06 20:50:48 -07:00
2 changed files with 12 additions and 10 deletions
+4 -3
View File
@@ -234,18 +234,19 @@ function UserPrefShowLotsaOptions()
end end
function UserPrefSpecialScoringMode() function UserPrefSpecialScoringMode()
local baseChoices = { 'DDR 1stMIX', 'DDR 4thMIX', 'DDR SuperNOVA', 'DDR SuperNOVA 2' }; --'[SSC] Radar Master'
local t = { local t = {
Name = "UserPrefSpecialScoringMode"; Name = "UserPrefSpecialScoringMode";
LayoutType = "ShowAllInRow"; LayoutType = "ShowAllInRow";
SelectType = "SelectOne"; SelectType = "SelectOne";
OneChoiceForAllPlayers = true; OneChoiceForAllPlayers = true;
ExportOnChange = false; ExportOnChange = false;
Choices = { 'DDR 1stMIX', 'DDR 4thMIX', 'DDR SuperNOVA', 'DDR SuperNOVA 2', '[SSC] Radar Master' }; Choices = baseChoices;
LoadSelections = function(self, list, pn) LoadSelections = function(self, list, pn)
if ReadPrefFromFile("UserPrefSpecialScoringMode") ~= nil then if ReadPrefFromFile("UserPrefSpecialScoringMode") ~= nil then
local theValue = ReadPrefFromFile("UserPrefSpecialScoringMode"); local theValue = ReadPrefFromFile("UserPrefSpecialScoringMode");
local success = false; 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; if success == false then list[1] = true end;
else else
WritePrefToFile("UserPrefSpecialScoringMode", 'DDR 1stMIX'); WritePrefToFile("UserPrefSpecialScoringMode", 'DDR 1stMIX');
@@ -253,7 +254,7 @@ function UserPrefSpecialScoringMode()
end; end;
end; end;
SaveSelections = function(self, list, pn) 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; end;
}; };
setmetatable( t, t ); setmetatable( t, t );
+8 -7
View File
@@ -19,7 +19,7 @@ r['DDR 4thMIX'] = function(params, pss)
local scoreLookupTable = { ['TapNoteScore_W1']=777, ['TapNoteScore_W2']=777, ['TapNoteScore_W3']=555 }; local scoreLookupTable = { ['TapNoteScore_W1']=777, ['TapNoteScore_W2']=777, ['TapNoteScore_W3']=555 };
setmetatable(scoreLookupTable, ZeroIfNotFound); setmetatable(scoreLookupTable, ZeroIfNotFound);
local comboBonusForThisStep = (pss:GetCurrentCombo()+1)*333; 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; end;
----------------------------------------------------------- -----------------------------------------------------------
--DDR SuperNOVA(-esque) scoring --DDR SuperNOVA(-esque) scoring
@@ -38,9 +38,10 @@ r['DDR SuperNOVA 2'] = function(params, pss)
pss:SetScore(math.round((pss:GetActualDancePoints()/dp)*100000)*10); pss:SetScore(math.round((pss:GetActualDancePoints()/dp)*100000)*10);
end; end;
----------------------------------------------------------- -----------------------------------------------------------
--Radar Master --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) --[[r['[SSC] Radar Master'] = function(params, pss)
local masterTable = { local masterTable = {
['RadarCategory_Stream'] = 0, ['RadarCategory_Stream'] = 0,
['RadarCategory_Voltage'] = 0, ['RadarCategory_Voltage'] = 0,
@@ -51,12 +52,12 @@ r['[SSC] Radar Master'] = function(params, pss)
local totalRadar = 0; local totalRadar = 0;
local finalScore = 0; local finalScore = 0;
for k,v in pairs(masterTable) do 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 if firstRadar == 0 then
masterTable[k] = nil; masterTable[k] = nil;
else else
v = pss:GetRadarPossible():GetValue(k); masterTable[k] = firstRadar;
totalRadar = totalRadar + v[1]; totalRadar = totalRadar + firstRadar;
end; end;
end; end;
--two loops are needed because we need to calculate totalRadar --two loops are needed because we need to calculate totalRadar
@@ -66,5 +67,5 @@ r['[SSC] Radar Master'] = function(params, pss)
finalScore = finalScore + curPortion*(500000000*(v/totalRadar)); finalScore = finalScore + curPortion*(500000000*(v/totalRadar));
end; end;
pss:SetScore(finalScore); pss:SetScore(finalScore);
end; end;]]
SpecialScoring = r; SpecialScoring = r;