From 22a55b3ce9f4f2108ea77acc1c4cbe84178c161e Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Fri, 28 Dec 2012 13:43:25 -0800 Subject: [PATCH] Revert "mess with the scoring code a bit" This reverts commit 28e5530357a5fde7e02d04c4aaaa19681b9ace8f. This kind of thing should be in global scripts. --- .../BGAnimations/ScreenGameplay decorations/default.lua | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua b/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua index 68887a89ff..9edbc6fbe9 100644 --- a/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua @@ -236,8 +236,6 @@ t[#t+1] = StandardDecorationFromFileOptional("StageDisplay","StageDisplay"); t[#t+1] = StandardDecorationFromFileOptional("SongTitle","SongTitle"); do - local w1PrefValue = PREFSMAN:GetPreference("AllowW1") - local showingW1 = w1PrefValue == 'AllowW1_Everywhere' or (w1PrefValue=='AllowW1_CoursesOnly' and GAMESTATE:IsCourseMode()) local pointLookup={ ['TapNoteScore_W1']=5, ['TapNoteScore_W2']=4, @@ -254,10 +252,6 @@ do setmetatable(pointLookup,{__index=0}) t[#t+1] = {Class="Actor", JudgmentMessageCommand=function(self,params) - if not showingW1 then - local withinW1Windows = math.abs(params.Offset)<=PREFSMAN:GetPreference("TimingWindowW1") - if withinW1Windows then params.TapNoteScore='TapNoteScore_W1' end - end local PSS = STATSMAN:GetCurStageStats():GetPlayerStageStats(params.Player) local holdNoteInfo = params.HoldNoteScore == nil and nil or params.HoldNoteScore == 'HoldNoteScore_Held' and true or false PSS:SetScore(PSS:GetScore()+pointLookup[params.TapNoteScore]+(holdNoteInfo and 5 or 0))