diff --git a/Themes/_fallback/Scripts/04 Scoring.lua b/Themes/_fallback/Scripts/04 Scoring.lua index 5b573738c4..38e928da60 100644 --- a/Themes/_fallback/Scripts/04 Scoring.lua +++ b/Themes/_fallback/Scripts/04 Scoring.lua @@ -304,20 +304,23 @@ r['MIGS'] = function(params,pss) for k,v in pairs(tapScoreTable) do curScore = curScore + ( pss:GetTapNoteScores(k) * v ); end; - curScore = curScore + ( pss:GetHoldNoteScores('HoldNoteScore_Held') * 6 ); - pss:SetScore(clamp(curScore,0,math.huge)); + curScore = math.max(0,curScore + ( pss:GetHoldNoteScores('HoldNoteScore_Held') * 6 )); end; +-------------------------------------------------------------- +--1bilDP scoring because I can. +-------------------------------------------------------------- +r['1bilDP']= function(params,pss) + local poss = pss:GetPossibleDancePoints() + pss:SetScore(math.floor((pss:GetActualDancePoints()/poss)*1000000000)) + pss:SetCurMaxScore(math.floor((pss:GetCurrentPossibleDancePoints()/poss)*1000000000)) +end ------------------------------------------------------------------------------- -- Formulas end here. -Scoring = {}; -setmetatable(Scoring, { - __metatable = { "Letting you change the metatable sort of defeats the purpose." }, - __index = function(tbl, key) - for v in ivalues(DisabledScoringModes) do - if key == v then return r['DDR Extreme'] end - end - return r[key] - end, - } -); +for v in ivalues(DisabledScoringModes) do r[v] = nil end +Scoring = {} +setmetatable(Scoring, { __index = function(...) return function(params,pss) +--put any code here that should run before every scoring function + if not GAMESTATE:IsHumanPlayer(params.Player) and type(r[key]) == "function" then + return r[key](...) end +end }