diff --git a/Themes/default/BGAnimations/ScreenPlayerOptions decorations.lua b/Themes/default/BGAnimations/ScreenPlayerOptions decorations.lua new file mode 100644 index 0000000000..346f4a256c --- /dev/null +++ b/Themes/default/BGAnimations/ScreenPlayerOptions decorations.lua @@ -0,0 +1,15 @@ +local num_players = GAMESTATE:GetHumanPlayers(); + +local t = LoadFallbackB(); + +for i=1,#num_players do + local metrics_name = "PlayerNameplate" .. ToEnumShortString(num_players[i]) + t[#t+1] = LoadActor( THEME:GetPathG(Var "LoadingScreen", "PlayerNameplate"), num_players[i] ) .. { + InitCommand=function(self) + self:name(metrics_name); + ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); + end + } +end + +return t; \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenPlayerOptions PlayerNameplate.lua b/Themes/default/Graphics/ScreenPlayerOptions PlayerNameplate.lua new file mode 100644 index 0000000000..70b3acc14c --- /dev/null +++ b/Themes/default/Graphics/ScreenPlayerOptions PlayerNameplate.lua @@ -0,0 +1,39 @@ +local PlayerNumber = ... +assert( PlayerNumber ) + +local bpm_text_zoom = 0.875 + +local t = Def.ActorFrame { + LoadActor(THEME:GetPathB("_frame","3x1"),"rounded fill", 192-8) .. { + OnCommand=cmd(diffuse,color("#333333");diffusealpha,0.875); + }; + LoadActor(THEME:GetPathB("_frame","3x1"),"rounded gloss", 192-8) .. { + OnCommand=cmd(diffusealpha,0.125); + }; + LoadFont("Common Normal") .. { + Text=ToEnumShortString(PlayerNumber); + Name="PlayerShortName", + InitCommand=cmd(x,-104;maxwidth,32), + OnCommand=cmd(diffuse,PlayerColor(PlayerNumber);shadowlength,1) + }, + LoadFont("Common Normal") .. { + Text="50 - 10000"; + Name="BPMRangeOld", + InitCommand=cmd(x,-40;maxwidth,88/bpm_text_zoom), + OnCommand=cmd(shadowlength,1;zoom,bpm_text_zoom) + }, + LoadActor(THEME:GetPathG("_StepsDisplayListRow","arrow")) .. { + Name="Seperator", + InitCommand=cmd(x,14) + }, + LoadFont("Common Normal") .. { + Text="100 - 200000"; + Name="BPMRangeNew", + InitCommand=cmd(x,68;maxwidth,88/bpm_text_zoom), + OnCommand=cmd(shadowlength,1;zoom,bpm_text_zoom;queuecommand,"BPMWillChange"), + BPMWillNotChangeCommand=cmd(stopeffect), + BPMWillChangeCommand=cmd(diffuseshift;effectcolor1,Color.White;effectcolor2,Color.Orange) + } +} + +return t \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 9359a68128..437db8099b 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -1427,6 +1427,16 @@ LineSF="lua,OptionRowScreenFilter()" Line17="lua,OptionRowProTiming()" Line18="list,Characters" +PlayerNameplateP1X=SCREEN_CENTER_X * 0.5 + 16 +PlayerNameplateP1Y=SCREEN_CENTER_Y - 176 +PlayerNameplateP1OnCommand=draworder,DrawOrder.Decorations;zoomy,0;addx,-SCREEN_CENTER_X;sleep,0.75;decelerate,0.25;addx,SCREEN_CENTER_X;zoomy,1 +PlayerNameplateP1OffCommand= + +PlayerNameplateP2X=SCREEN_CENTER_X * 1.5 - 16 +PlayerNameplateP2Y=SCREEN_CENTER_Y - 176 +PlayerNameplateP2OnCommand=draworder,DrawOrder.Decorations;zoomy,0;addx,SCREEN_CENTER_X;sleep,0.75;decelerate,0.25;addx,-SCREEN_CENTER_X;zoomy,1 +PlayerNameplateP2OffCommand= + [ScreenPlayerOptionsRestricted] [ScreenSplash]