diff --git a/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua b/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua index 9edbc6fbe9..a8664db8b2 100644 --- a/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua @@ -235,28 +235,4 @@ t[#t+1] = StandardDecorationFromFileOptional("BPMDisplay","BPMDisplay"); t[#t+1] = StandardDecorationFromFileOptional("StageDisplay","StageDisplay"); t[#t+1] = StandardDecorationFromFileOptional("SongTitle","SongTitle"); -do - local pointLookup={ - ['TapNoteScore_W1']=5, - ['TapNoteScore_W2']=4, - ['TapNoteScore_W3']=3, - ['TapNoteScore_W4']=2, - ['TapNoteScore_W5']=1, - ['TapNoteScore_HitMine']=-1} - local ignorableTapNoteScores = { - ['TapNoteScore_HitMine']=true, - ['TapNoteScore_AvoidMine']=true, - ['TapNoteScore_CheckpointHit']=true, - ['TapNoteScore_CheckpointMiss']=true - } - setmetatable(pointLookup,{__index=0}) - t[#t+1] = {Class="Actor", - JudgmentMessageCommand=function(self,params) - 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)) - PSS:SetCurMaxScore(PSS:GetCurMaxScore()+(holdNoteInfo~=nil and 5 or 0)+(ignorableTapNoteScores[params.TapNoteScore] and 0 or 5)) - end - } -end return t diff --git a/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua.orig b/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua.orig index e7d4646b8f..a8664db8b2 100644 --- a/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua.orig +++ b/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua.orig @@ -234,34 +234,5 @@ end; t[#t+1] = StandardDecorationFromFileOptional("BPMDisplay","BPMDisplay"); t[#t+1] = StandardDecorationFromFileOptional("StageDisplay","StageDisplay"); t[#t+1] = StandardDecorationFromFileOptional("SongTitle","SongTitle"); -t[#t+1] = Def.ActorFrame { - Def.ActorFrame { - Name="LifeTest"; - Owner=PLAYER_1; - InitCommand=cmd(x,Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX");y,SCREEN_TOP+80); - LifeChangedMessageCommand=function(self,params) - local c = self:GetChildren(); - if params.Player == PLAYER_1 then - local fLife = params.LifeMeter:GetLife(); - c.LifeText:settextf("%03i", fLife * 100); - end - end; - HealthStateChangedMessageCommand=function(self, params) - local c = self.GetChildren(); - if params.PlayerNumber == PLAYER_1 then - c.LifeText:settext( ToEnumShortString(params.HealthState) ); - end - end; - -- - LoadFont("Common Normal") .. { - Name="LifeText"; - InitCommand=cmd(shadowlength,1); - HotCommand=cmd(stopeffect;diffuse,Color.White;diffuseshift;effectcolor2,Color.White;effectcolor1,Color.Orange); - AliveCommand=cmd(stopeffect;diffuse,Color.White;); - DangerCommand=cmd(stopeffect;diffuse,Color.White;diffuseshift;effectcolor2,Color.Red;effectcolor2,BoostColor(Color.Red,0.5)); - DeadCommand=cmd(stopeffect;diffuse,Color.Black); - }; - }; -}; return t