From 4d3afa8eb97ee00b69312fc02337bf9380b274a6 Mon Sep 17 00:00:00 2001 From: Barinade Date: Mon, 12 Dec 2022 21:13:58 -0600 Subject: [PATCH] this commit functionally does nothing --- .../ScreenGameplay overlay/titlesplash.lua | 127 +++++++++--------- 1 file changed, 61 insertions(+), 66 deletions(-) diff --git a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/titlesplash.lua b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/titlesplash.lua index 8f67ec86ef..37367dccf2 100644 --- a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/titlesplash.lua +++ b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/titlesplash.lua @@ -4,9 +4,8 @@ local translated_info = { InvalidMods = THEME:GetString("ScreenGameplay", "InvalidMods") } -local t = - Def.ActorFrame { - -- splashy thing when you first start a song +-- splashy thing when you first start a song +local t = Def.ActorFrame { Name = "Splashy", DootCommand = function(self) self:RemoveAllChildren() @@ -22,71 +21,67 @@ local t = self:smooth(0.5):diffusealpha(0.7):sleep(1):smooth(0.3):smooth(0.4):diffusealpha(0) end }, - LoadFont("Common Large") .. - { - Name = "DestroyMe2", - InitCommand = function(self) - self:xy(SCREEN_CENTER_X, SCREEN_CENTER_Y - 50):zoom(0.5):diffusealpha(0):maxwidth(400 / 0.45) - end, - BeginCommand = function(self) - self:settext(GAMESTATE:GetCurrentSong():GetDisplayMainTitle()) - end, - OnCommand = function(self) - self:smooth(0.5):diffusealpha(1):sleep(1):smooth(0.3):smooth(0.4):diffusealpha(0) - end - }, - LoadFont("Common Normal") .. - { - Name = "DestroyMe3", - InitCommand = function(self) - self:xy(SCREEN_CENTER_X, SCREEN_CENTER_Y - 35):zoom(0.45):diffusealpha(0):maxwidth(400 / 0.45) - end, - BeginCommand = function(self) - self:settext(GAMESTATE:GetCurrentSong():GetDisplaySubTitle()) - end, - OnCommand = function(self) - self:smooth(0.5):diffusealpha(1):sleep(1):smooth(0.3):smooth(0.4):diffusealpha(0) - end - }, - LoadFont("Common Normal") .. - { - Name = "DestroyMe4", - InitCommand = function(self) - self:xy(SCREEN_CENTER_X, SCREEN_CENTER_Y - 25):zoom(0.45):diffusealpha(0) - end, - BeginCommand = function(self) - self:settext(GAMESTATE:GetCurrentSong():GetDisplayArtist()) - end, - OnCommand = function(self) - local time = 0.4 - if #mods > 0 then - time = 2 - end - self:smooth(0.5):diffusealpha(1):sleep(1):smooth(0.3):smooth(0.4):diffusealpha(0):sleep(time):queuecommand("Doot") - end, - DootCommand = function(self) - self:GetParent():queuecommand("Doot") + LoadFont("Common Large") .. { + Name = "DestroyMe2", + InitCommand = function(self) + self:xy(SCREEN_CENTER_X, SCREEN_CENTER_Y - 50):zoom(0.5):diffusealpha(0):maxwidth(400 / 0.45) + end, + BeginCommand = function(self) + self:settext(GAMESTATE:GetCurrentSong():GetDisplayMainTitle()) + end, + OnCommand = function(self) + self:smooth(0.5):diffusealpha(1):sleep(1):smooth(0.3):smooth(0.4):diffusealpha(0) + end + }, + LoadFont("Common Normal") .. { + Name = "DestroyMe3", + InitCommand = function(self) + self:xy(SCREEN_CENTER_X, SCREEN_CENTER_Y - 35):zoom(0.45):diffusealpha(0):maxwidth(400 / 0.45) + end, + BeginCommand = function(self) + self:settext(GAMESTATE:GetCurrentSong():GetDisplaySubTitle()) + end, + OnCommand = function(self) + self:smooth(0.5):diffusealpha(1):sleep(1):smooth(0.3):smooth(0.4):diffusealpha(0) + end + }, + LoadFont("Common Normal") .. { + Name = "DestroyMe4", + InitCommand = function(self) + self:xy(SCREEN_CENTER_X, SCREEN_CENTER_Y - 25):zoom(0.45):diffusealpha(0) + end, + BeginCommand = function(self) + self:settext(GAMESTATE:GetCurrentSong():GetDisplayArtist()) + end, + OnCommand = function(self) + local time = 0.4 + if #mods > 0 then + time = 2 end - }, - LoadFont("Common Normal") .. - { - Name = "DestroyMe5", - InitCommand = function(self) - self:xy(SCREEN_CENTER_X, SCREEN_CENTER_Y - 10):zoom(0.7):diffusealpha(0):valign(0) - end, - BeginCommand = function(self) - mods = GAMESTATE:GetPlayerState():GetCurrentPlayerOptions():GetInvalidatingMods() - local translated = {} - if #mods > 0 then - for _,mod in ipairs(mods) do - table.insert(translated, THEME:HasString("OptionNames", mod) and THEME:GetString("OptionNames", mod) or mod) - end - self:settextf("%s\n%s", translated_info["InvalidMods"], table.concat(translated, "\n")) + self:smooth(0.5):diffusealpha(1):sleep(1):smooth(0.3):smooth(0.4):diffusealpha(0):sleep(time):queuecommand("Doot") + end, + DootCommand = function(self) + self:GetParent():queuecommand("Doot") + end + }, + LoadFont("Common Normal") .. { + Name = "DestroyMe5", + InitCommand = function(self) + self:xy(SCREEN_CENTER_X, SCREEN_CENTER_Y - 10):zoom(0.7):diffusealpha(0):valign(0) + end, + BeginCommand = function(self) + mods = GAMESTATE:GetPlayerState():GetCurrentPlayerOptions():GetInvalidatingMods() + local translated = {} + if #mods > 0 then + for _,mod in ipairs(mods) do + table.insert(translated, THEME:HasString("OptionNames", mod) and THEME:GetString("OptionNames", mod) or mod) end - end, - OnCommand = function(self) - self:smooth(0.5):diffusealpha(1):sleep(1):smooth(0.3):smooth(0.4):smooth(2):diffusealpha(0) + self:settextf("%s\n%s", translated_info["InvalidMods"], table.concat(translated, "\n")) end - } + end, + OnCommand = function(self) + self:smooth(0.5):diffusealpha(1):sleep(1):smooth(0.3):smooth(0.4):smooth(2):diffusealpha(0) + end + } } return t