From b4cad271f4226f7637bbbc289d70786f07ac53d1 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 29 Mar 2018 18:19:20 -0400 Subject: [PATCH] Minor QoL theme edits Adds scrollwheel select to Netplay Adds NetPlay mouse avatar select to SP Username localization during avatar change --- .../ScreenNetRoom overlay/default.lua | 1 + .../ScreenSelectMusic overlay/default.lua | 31 ++++++++++++++++--- .../BGAnimations/ScreenTitleMenu underlay.lua | 2 +- .../Til Death/BGAnimations/_switchavatar.lua | 8 +++-- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/Themes/Til Death/BGAnimations/ScreenNetRoom overlay/default.lua b/Themes/Til Death/BGAnimations/ScreenNetRoom overlay/default.lua index 35e4341b1b..b2ab625430 100644 --- a/Themes/Til Death/BGAnimations/ScreenNetRoom overlay/default.lua +++ b/Themes/Til Death/BGAnimations/ScreenNetRoom overlay/default.lua @@ -39,6 +39,7 @@ t[#t+1] = LoadFont("Common Large")..{ } t[#t+1] = LoadActor("../_cursor"); t[#t+1] = LoadActor("../_mouseselect") +t[#t+1] = LoadActor("../_mousewheelscroll") t[#t+1] = LoadActor("currenttime"); t[#t+1] = LoadActor("../_halppls"); t[#t+1] = LoadActor("../_userlist"); diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/default.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/default.lua index fd7ea42d23..58258d072a 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/default.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/default.lua @@ -1,12 +1,33 @@ -local t = Def.ActorFrame{} +local function input(event) + local top = SCREENMAN:GetTopScreen() + if event.DeviceInput.button == 'DeviceButton_left mouse button' then + if event.type == "InputEventType_Release" then + if GAMESTATE:IsPlayerEnabled(PLAYER_1) then + if isOver(top:GetChild("Overlay"):GetChild("PlayerAvatar"):GetChild("Avatar"..PLAYER_1):GetChild("Image")) then + SCREENMAN:AddNewScreenToTop("ScreenAvatarSwitch"); + end; + end; + if GAMESTATE:IsPlayerEnabled(PLAYER_2) then + if isOver(top:GetChild("Overlay"):GetChild("PlayerAvatar"):GetChild("Avatar"..PLAYER_2):GetChild("Image")) then + SCREENMAN:AddNewScreenToTop("ScreenAvatarSwitch"); + end; + end; + end; + end +return false; +end + +local t = Def.ActorFrame{ + OnCommand=function(self) SCREENMAN:GetTopScreen():AddInputCallback(input) SCREENMAN:GetTopScreen():UsersVisible(false) end; +} t[#t+1] = Def.Actor{ CodeMessageCommand=function(self,params) if params.Name == "AvatarShow" and getTabIndex() == 0 then - SCREENMAN:AddNewScreenToTop("ScreenAvatarSwitch") - end - end -} + SCREENMAN:AddNewScreenToTop("ScreenAvatarSwitch"); + end; + end; +}; t[#t+1] = LoadActor("../_frame") t[#t+1] = LoadActor("../_PlayerInfo") diff --git a/Themes/Til Death/BGAnimations/ScreenTitleMenu underlay.lua b/Themes/Til Death/BGAnimations/ScreenTitleMenu underlay.lua index a5968e1382..9e27eb0703 100644 --- a/Themes/Til Death/BGAnimations/ScreenTitleMenu underlay.lua +++ b/Themes/Til Death/BGAnimations/ScreenTitleMenu underlay.lua @@ -26,7 +26,7 @@ t[#t+1] = LoadFont("Common Large") .. { t[#t+1] = LoadActor(THEME:GetPathG("","_ring")) .. { InitCommand=function(self) - self:xy(capWideScale(get43size(SCREEN_WIDTH-10),SCREEN_WIDTH-530),frameY-130):diffuse(getDifficultyColor("Difficulty_Couple")):diffusealpha(1):baserotationx(420) + self:xy(capWideScale(get43size(SCREEN_WIDTH-10),SCREEN_WIDTH-530),frameY-130):diffuse(getDifficultyColor("Difficulty_Couple")):diffusealpha(1):baserotationx(0) end } return t \ No newline at end of file diff --git a/Themes/Til Death/BGAnimations/_switchavatar.lua b/Themes/Til Death/BGAnimations/_switchavatar.lua index 044c01f37f..f7da4ffe70 100644 --- a/Themes/Til Death/BGAnimations/_switchavatar.lua +++ b/Themes/Til Death/BGAnimations/_switchavatar.lua @@ -72,10 +72,11 @@ local function saveAvatar(pn) local avatar = getSelectedAvatar(pn) local profile = PROFILEMAN:GetProfile(pn) local GUID = profile:GetGUID() + local profileName = profile:GetDisplayName() avatarConfig:get_data().avatar[GUID] = avatar avatarConfig:set_dirty() avatarConfig:save() - SCREENMAN:SystemMessage(string.format("%s Avatar set to: '%s'",pn,avatar)) + SCREENMAN:SystemMessage(string.format("%s's avatar set to: '%s'",profileName,avatar)) end -- The main function that contains errything @@ -222,12 +223,13 @@ local function avatarSwitch(pn) self:queuecommand("Set") end; SetCommand=function(self,params) + local profileName = profile:GetDisplayName() --self:settextf("Player 1 avatar: ci%d ai%d",cursorIndex,avatarIndex) if pn == PLAYER_1 then - self:settextf("Player 1 Avatar: %s",avatars[data[pn]["avatarIndex"]]) + self:settextf("%s's avatar: %s",profileName,avatars[data[pn]["avatarIndex"]]) end; if pn == PLAYER_2 then - self:settextf("Player 2 Avatar: %s",avatars[data[pn]["avatarIndex"]]) + self:settextf("%s's avatar: %s",profileName,avatars[data[pn]["avatarIndex"]]) end; end; CodeMessageCommand=function(self)