diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua index 430c7c5965..db11fd86c8 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua @@ -166,31 +166,31 @@ local ret = self:queuecommand("Set") updateLeaderBoardForCurrentChart() end, - CodeMessageCommand = function(self, params) -- this is intentionally bad to remind me to fix other things that are bad -mina + CodeMessageCommand = function(self, params) -- this is intentionally bad to remind me to fix other things that are bad -mina if ((getTabIndex() == 2 and nestedTab == 2) and not collapsed) and DLMAN:GetCurrentRateFilter() then local rate = getCurRateValue() - if params.Name == "PrevScore" and rate < 2.95 then - GAMESTATE:GetSongOptionsObject("ModsLevel_Preferred"):MusicRate(rate + 0.1) - GAMESTATE:GetSongOptionsObject("ModsLevel_Song"):MusicRate(rate + 0.1) - GAMESTATE:GetSongOptionsObject("ModsLevel_Current"):MusicRate(rate + 0.1) - MESSAGEMAN:Broadcast("CurrentRateChanged") - elseif params.Name == "NextScore" and rate > 0.75 then - GAMESTATE:GetSongOptionsObject("ModsLevel_Preferred"):MusicRate(rate - 0.1) - GAMESTATE:GetSongOptionsObject("ModsLevel_Song"):MusicRate(rate - 0.1) - GAMESTATE:GetSongOptionsObject("ModsLevel_Current"):MusicRate(rate - 0.1) - MESSAGEMAN:Broadcast("CurrentRateChanged") - end - if params.Name == "PrevRate" and rate < 3 then - GAMESTATE:GetSongOptionsObject("ModsLevel_Preferred"):MusicRate(rate + 0.05) - GAMESTATE:GetSongOptionsObject("ModsLevel_Song"):MusicRate(rate + 0.05) - GAMESTATE:GetSongOptionsObject("ModsLevel_Current"):MusicRate(rate + 0.05) - MESSAGEMAN:Broadcast("CurrentRateChanged") - elseif params.Name == "NextRate" and rate > 0.7 then - GAMESTATE:GetSongOptionsObject("ModsLevel_Preferred"):MusicRate(rate - 0.05) - GAMESTATE:GetSongOptionsObject("ModsLevel_Song"):MusicRate(rate - 0.05) - GAMESTATE:GetSongOptionsObject("ModsLevel_Current"):MusicRate(rate - 0.05) - MESSAGEMAN:Broadcast("CurrentRateChanged") - end + if params.Name == "PrevScore" and rate < 2.95 then + GAMESTATE:GetSongOptionsObject("ModsLevel_Preferred"):MusicRate(rate + 0.1) + GAMESTATE:GetSongOptionsObject("ModsLevel_Song"):MusicRate(rate + 0.1) + GAMESTATE:GetSongOptionsObject("ModsLevel_Current"):MusicRate(rate + 0.1) + MESSAGEMAN:Broadcast("CurrentRateChanged") + elseif params.Name == "NextScore" and rate > 0.75 then + GAMESTATE:GetSongOptionsObject("ModsLevel_Preferred"):MusicRate(rate - 0.1) + GAMESTATE:GetSongOptionsObject("ModsLevel_Song"):MusicRate(rate - 0.1) + GAMESTATE:GetSongOptionsObject("ModsLevel_Current"):MusicRate(rate - 0.1) + MESSAGEMAN:Broadcast("CurrentRateChanged") + end + if params.Name == "PrevRate" and rate < 3 then + GAMESTATE:GetSongOptionsObject("ModsLevel_Preferred"):MusicRate(rate + 0.05) + GAMESTATE:GetSongOptionsObject("ModsLevel_Song"):MusicRate(rate + 0.05) + GAMESTATE:GetSongOptionsObject("ModsLevel_Current"):MusicRate(rate + 0.05) + MESSAGEMAN:Broadcast("CurrentRateChanged") + elseif params.Name == "NextRate" and rate > 0.7 then + GAMESTATE:GetSongOptionsObject("ModsLevel_Preferred"):MusicRate(rate - 0.05) + GAMESTATE:GetSongOptionsObject("ModsLevel_Song"):MusicRate(rate - 0.05) + GAMESTATE:GetSongOptionsObject("ModsLevel_Current"):MusicRate(rate - 0.05) + MESSAGEMAN:Broadcast("CurrentRateChanged") + end end end, CurrentRateChangedMessageCommand = function(self) @@ -348,48 +348,45 @@ local l = end }, LoadFont("Common Normal") .. - { - Name = "Score", - InitCommand = function(self) - self:xy(55, 30):zoom(0.6):halign(0):settext("") - end, - DisplayCommand = function(self) - if score:GetWifeScore() == 0 then - self:settext("") - else - local overall = score:GetSkillsetSSR("Overall") - self:settextf("%.2f", overall):diffuse(byMSD(overall)) + { + Name = "Score", + InitCommand = function(self) + self:xy(55, 30):zoom(0.6):halign(0):settext("") + end, + DisplayCommand = function(self) + if score:GetWifeScore() == 0 then + self:settext("") + else + local overall = score:GetSkillsetSSR("Overall") + self:settextf("%.2f", overall):diffuse(byMSD(overall)) + end end - end - }, + }, LoadFont("Common Normal") .. - { - Name = "Score", - InitCommand = function(self) - self:xy(55, 43):zoom(0.5):halign(0):settext("") - end, - DisplayCommand = function(self) - if score:GetWifeScore() == 0 then - self:settext("") - else - self:settext(GAMESTATE:GetCurrentSteps(PLAYER_1):GetRelevantSkillsetsByMSDRank(getCurRateValue(), 1)) + { + Name = "Score", + InitCommand = function(self) + self:xy(55, 43):zoom(0.5):halign(0):settext("") + end, + DisplayCommand = function(self) + if score:GetWifeScore() == 0 then + self:settext("") + else + self:settext(GAMESTATE:GetCurrentSteps(PLAYER_1):GetRelevantSkillsetsByMSDRank(getCurRateValue(), 1)) + end end - end - }, - + }, LoadFont("Common Normal") .. - { - Name = "ClearType", - InitCommand = function(self) - self:y(43):zoom(0.5):halign(0):settext("No Play"):diffuse( - color(colorConfig:get_data().clearType["NoPlay"]) - ) - end, - DisplayCommand = function(self) - self:settext(getClearTypeFromScore(pn, score, 0)) - self:diffuse(getClearTypeFromScore(pn, score, 2)) - end - }, + { + Name = "ClearType", + InitCommand = function(self) + self:y(43):zoom(0.5):halign(0):settext("No Play"):diffuse(color(colorConfig:get_data().clearType["NoPlay"])) + end, + DisplayCommand = function(self) + self:settext(getClearTypeFromScore(pn, score, 0)) + self:diffuse(getClearTypeFromScore(pn, score, 2)) + end + }, LoadFont("Common Normal") .. { Name = "Combo", @@ -609,6 +606,11 @@ l[#l + 1] = InitCommand = function(self) self:xy((frameWidth - offsetX - frameX) / 2, frameHeight - headeroffY - 30 - offsetY):zoom(0.5):settext("") end, + BeginCommand = function(self) + if SCREENMAN:GetTopScreen():GetName() == "ScreenNetSelectMusic" then + self:x(-10):zoom(0.0000001):maxwidth(1) + end + end, DisplayCommand = function(self) if hasReplayData then self:settext("View Replay") diff --git a/Themes/Til Death/BGAnimations/superscoreboard.lua b/Themes/Til Death/BGAnimations/superscoreboard.lua index 2d9375c0aa..2a4a9b7311 100644 --- a/Themes/Til Death/BGAnimations/superscoreboard.lua +++ b/Themes/Til Death/BGAnimations/superscoreboard.lua @@ -91,7 +91,7 @@ local o = SetFromLeaderboardCommand = function(self, lb) scoretable = lb ind = 0 - self:playcommand("GetFilteredLeaderboard") -- we can move all the filter stuff to lua so we're not being dumb hurr hur -mina + self:playcommand("GetFilteredLeaderboard") -- we can move all the filter stuff to lua so we're not being dumb hurr hur -mina self:playcommand("Update") end, UpdateCommand = function(self) @@ -338,7 +338,7 @@ local function makeScoreDisplay(i) CurrentSongChangedMessageCommand = function(self) self:visible(false) end, - UpdateCommand = function(self) + UpdateCommand = function(self) hs = scoretable[(i + ind)] if hs and i <= numscores then self:visible(true) @@ -470,7 +470,14 @@ local function makeScoreDisplay(i) Name = "Replay" .. i, InitCommand = function(self) if not collapsed then - self:x(capWideScale(c3x + 52, c3x) ):zoom(tzoom - 0.05):halign(1):valign(0):maxwidth(width / 2 / tzoom):addy(row2yoff):diffuse(getMainColor("enabled")) + self:x(capWideScale(c3x + 52, c3x)):zoom(tzoom - 0.05):halign(1):valign(0):maxwidth(width / 2 / tzoom):addy( + row2yoff + ):diffuse(getMainColor("enabled")) + end + end, + BeginCommand = function(self) + if SCREENMAN:GetTopScreen():GetName() == "ScreenNetSelectMusic" then + self:x(-10):zoom(0.0000001):maxwidth(1) end end, DisplayCommand = function(self)