diff --git a/Themes/default/BGAnimations/Online background/_base.png b/Themes/default/BGAnimations/Online background/_base.png index 5771a8f36e..23e61ab90e 100644 Binary files a/Themes/default/BGAnimations/Online background/_base.png and b/Themes/default/BGAnimations/Online background/_base.png differ diff --git a/Themes/default/BGAnimations/Online background/default.lua b/Themes/default/BGAnimations/Online background/default.lua index e6f63a2fea..5ca1ed13c3 100644 --- a/Themes/default/BGAnimations/Online background/default.lua +++ b/Themes/default/BGAnimations/Online background/default.lua @@ -1,8 +1,8 @@ -- You know what, I guess the "fancy UI background" theme option can be put to use. if ThemePrefs.Get("FancyUIBG") then - return Def.ActorFrame { + return Def.ActorFrame { Def.Quad { - InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color("#093A3E");diffusetopedge,color("#000000");); + InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color("#18060C");diffusetopedge,color("#000000");); }; LoadActor("_base") .. { @@ -10,17 +10,23 @@ if ThemePrefs.Get("FancyUIBG") then }, LoadActor("_barcode") .. { - InitCommand=cmd(zoomto,36,1024;diffuse,color("#65F0FD");x,SCREEN_LEFT+15;y,SCREEN_CENTER_Y;diffusealpha,0.1); + InitCommand=cmd(zoomto,36,1024;diffuse,color("#882D47");x,SCREEN_LEFT+15;y,SCREEN_CENTER_Y;diffusealpha,0.1); OnCommand=cmd(customtexturerect,0,0,1,1;texcoordvelocity,0,-0.1); }; LoadActor("_barcode") .. { - InitCommand=cmd(zoomto,36,1024;diffuse,color("#65F0FD");x,SCREEN_RIGHT-15;y,SCREEN_CENTER_Y;diffusealpha,0.1); + InitCommand=cmd(zoomto,36,1024;diffuse,color("#882D47");x,SCREEN_RIGHT-15;y,SCREEN_CENTER_Y;diffusealpha,0.1); OnCommand=cmd(customtexturerect,0,0,1,1;texcoordvelocity,0,0.1); }; }; else - return Def.Quad { - InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color("#222222");diffusetopedge,color("#000000");); + return Def.ActorFrame { + Def.Quad { + InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color("#18060C");diffusetopedge,color("#000000");); + }; + + LoadActor("_base") .. { + InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;blend,'BlendMode_Add';); + }, }; end \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenEditMenu background.lua b/Themes/default/BGAnimations/ScreenEditMenu background.lua index 50e40cbc2d..d8b9a795dc 100644 --- a/Themes/default/BGAnimations/ScreenEditMenu background.lua +++ b/Themes/default/BGAnimations/ScreenEditMenu background.lua @@ -11,7 +11,7 @@ t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame { Def.Quad { InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+20;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT*0.70;); - OnCommand=cmd(diffuse,color("#61414B");diffusealpha,0.4); + OnCommand=cmd(diffuse,color("#61414B");diffusealpha,0.75); }; }; diff --git a/Themes/default/BGAnimations/ScreenEvaluation underlay/_bannerframe.png b/Themes/default/BGAnimations/ScreenEvaluation underlay/_bannerframe.png index fb4408edea..4b7ab5328f 100644 Binary files a/Themes/default/BGAnimations/ScreenEvaluation underlay/_bannerframe.png and b/Themes/default/BGAnimations/ScreenEvaluation underlay/_bannerframe.png differ diff --git a/Themes/default/BGAnimations/ScreenGameplay in/CourseDisplay.lua b/Themes/default/BGAnimations/ScreenGameplay in/CourseDisplay.lua new file mode 100644 index 0000000000..dc316ffd8d --- /dev/null +++ b/Themes/default/BGAnimations/ScreenGameplay in/CourseDisplay.lua @@ -0,0 +1,37 @@ +if not GAMESTATE:IsCourseMode() then return Def.ActorFrame{} end; -- short circuit +local slideTime = 1.1; +local slideWait = 1.25; +local bottomSlide = 0.76; +local course = GAMESTATE:GetCurrentCourse() + +local t = Def.ActorFrame{ + -- background + Def.Sprite{ + InitCommand=cmd(Center); + BeginCommand=function(self) + if course:GetBackgroundPath() then + self:Load( course:GetBackgroundPath() ) + else + -- default to the BG of the first song in the course + self:LoadFromCurrentSongBackground() + end + end; + OnCommand=function(self) + self:scale_or_crop_background() + self:addy(SCREEN_HEIGHT):sleep(slideWait):smooth(slideTime):addy(-SCREEN_HEIGHT); + end; + }; + -- alternate background + Def.Sprite{ + InitCommand=cmd(Center;); + BeginCommand=cmd(LoadFromCurrentSongBackground;scale_or_crop_background;diffusealpha,0); + OnCommand=cmd(playcommand,"Show"); + ShowCommand=function(self) + if course:HasBackground() then + self:addy(SCREEN_HEIGHT):sleep(slideWait):smooth(slideTime):addy(-SCREEN_HEIGHT); + end + end; + }; +}; + +return t; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenGameplay in/default.lua b/Themes/default/BGAnimations/ScreenGameplay in/default.lua index 9a6b739e9d..8965ce3c2e 100644 --- a/Themes/default/BGAnimations/ScreenGameplay in/default.lua +++ b/Themes/default/BGAnimations/ScreenGameplay in/default.lua @@ -1,3 +1,18 @@ +local playMode = GAMESTATE:GetPlayMode() +local slideTime = 1.1; +local slideWait = 1.25; +local bottomSlide = 0.76; +local easeTime = 0.10; + +local playMode = GAMESTATE:GetPlayMode() +local sStage = "" +sStage = GAMESTATE:GetCurrentStage() + +if playMode ~= 'PlayMode_Regular' and playMode ~= 'PlayMode_Rave' and playMode ~= 'PlayMode_Battle' then + sStage = playMode; +end; + + local t = Def.ActorFrame {}; t[#t+1] = Def.Sprite { InitCommand=cmd(Center;diffusealpha,1); @@ -13,6 +28,153 @@ t[#t+1] = Def.Sprite { end; }; +-- BG for credits +t[#t+1] = Def.ActorFrame { + OnCommand=cmd(smooth,bottomSlide;addy,240;sleep,0.2;diffusealpha,0;); + -- Behind stage graphic + Def.Quad { + InitCommand=cmd(vertalign,bottom;x,SCREEN_CENTER_X;y,SCREEN_BOTTOM-110;zoomto,SCREEN_WIDTH,120;); + OnCommand=function(self) + self:diffuse(color("#000000")):diffusealpha(0.8); + end + }; + -- Behind song + Def.Quad { + InitCommand=cmd(vertalign,bottom;x,SCREEN_CENTER_X;y,SCREEN_BOTTOM;zoomto,SCREEN_WIDTH,110;); + OnCommand=function(self) + self:diffuse(color("#000000")):diffusealpha(0.9); + end + }; +}; + + +local stage_num_actor= THEME:GetPathG("ScreenStageInformation", "Stage " .. ToEnumShortString(sStage), true) +if stage_num_actor ~= "" and FILEMAN:DoesFileExist(stage_num_actor) then + stage_num_actor= LoadActor(stage_num_actor) +else + -- Midiman: We need a "Stage Next" actor or something for stages after + -- the 6th. -Kyz + local curStage = GAMESTATE:GetCurrentStage(); + stage_num_actor= Def.BitmapText{ + Font= "Common Normal", Text= thified_curstage_index(false) .. " Stage", + InitCommand= function(self) + self:zoom(1.5) + self:strokecolor(Color.Black) + self:diffuse(StageToColor(curStage)); + self:diffusetopedge(ColorLightTone(StageToColor(curStage))); + end + } +end + +t[#t+1] = Def.ActorFrame { + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+190); + OnCommand=cmd(smooth,bottomSlide;addy,240;sleep,0.2;diffusealpha,0;); + + stage_num_actor .. { + OnCommand=cmd(zoom,1;diffusealpha,1); + }; +}; + +-- Step author credits + if GAMESTATE:IsHumanPlayer(PLAYER_1) == true then + t[#t+1] = Def.ActorFrame { + InitCommand=cmd(y,SCREEN_BOTTOM-80;x,SCREEN_LEFT+40;); + OnCommand=cmd(smooth,bottomSlide;addy,240;sleep,0.2;diffusealpha,0;); + LoadFont("Common Italic Condensed") .. { + OnCommand=cmd(playcommand,"Set";horizalign,left;diffuse,color("#FFFFFF");); + SetCommand=function(self) + stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) + local song = GAMESTATE:GetCurrentSong(); + if song then + if stepsP1:GetAuthorCredit() ~= "" then + self:settext(string.upper(THEME:GetString("OptionTitles","Step Author")) .. ":"); + else + self:settext("") + end + else + self:settext("") + end + end + }; + LoadFont("Common Fallback Font") .. { + InitCommand=cmd(addy,22); + OnCommand=cmd(playcommand,"Set";horizalign,left;zoom,0.75;diffuse,color("#FFFFFF");); + SetCommand=function(self) + stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) + local song = GAMESTATE:GetCurrentSong(); + if song then + if stepsP1 ~= nil then + self:settext(stepsP1:GetAuthorCredit()) + else + self:settext("") + end + else + self:settext("") + end + end + }; + }; + end + + if GAMESTATE:IsHumanPlayer(PLAYER_2) == true then + t[#t+1] = Def.ActorFrame { + InitCommand=cmd(y,SCREEN_BOTTOM-80;x,SCREEN_RIGHT-40;); + OnCommand=cmd(smooth,bottomSlide;addy,240;sleep,0.2;diffusealpha,0;); + LoadFont("Common Italic Condensed") .. { + OnCommand=cmd(playcommand,"Set";horizalign,right;diffuse,color("#FFFFFF");); + SetCommand=function(self) + stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) + local song = GAMESTATE:GetCurrentSong(); + if song then + local diff = stepsP2:GetDifficulty(); + if stepsP2:GetAuthorCredit() ~= "" then + self:settext(string.upper(THEME:GetString("OptionTitles","Step Author")) .. ":"); + else + self:settext("") + end + else + self:settext("") + end + end + }; + + LoadFont("Common Fallback Font") .. { + InitCommand=cmd(addy,22); + OnCommand=cmd(playcommand,"Set";horizalign,right;zoom,0.75;diffuse,color("#FFFFFF");); + SetCommand=function(self) + stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) + local song = GAMESTATE:GetCurrentSong(); + if song then + if stepsP2 ~= nil then + self:settext(stepsP2:GetAuthorCredit()) + else + self:settext("") + end + else + self:settext("") + end + end + }; + }; + end + +-- Song title and artist +t[#t+1] = Def.ActorFrame { + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_BOTTOM-80); + OnCommand=cmd(smooth,bottomSlide;addy,240;sleep,0.2;diffusealpha,0;); + LoadFont("Common Fallback Font") .. { + Text=GAMESTATE:IsCourseMode() and GAMESTATE:GetCurrentCourse():GetDisplayFullTitle() or GAMESTATE:GetCurrentSong():GetDisplayFullTitle(); + InitCommand=cmd(diffuse,color("#FFFFFF");maxwidth,SCREEN_WIDTH*0.6); + OnCommand=cmd(zoom,1;); + }; + LoadFont("Common Fallback Font") .. { + Text=GAMESTATE:IsCourseMode() and ToEnumShortString( GAMESTATE:GetCurrentCourse():GetCourseType() ) or GAMESTATE:GetCurrentSong():GetDisplayArtist(); + InitCommand=cmd(diffuse,color("#FFFFFF");maxwidth,SCREEN_WIDTH*0.6); + OnCommand=cmd(zoom,0.75;addy,24;); + }; +}; + + -- Pause menu t[#t+1]= LoadActor(THEME:GetPathG("", "pause_menu")) diff --git a/Themes/default/BGAnimations/ScreenProfileLoad overlay/default.lua b/Themes/default/BGAnimations/ScreenProfileLoad overlay/default.lua index 4a2b0510b4..e4b3e7406a 100644 --- a/Themes/default/BGAnimations/ScreenProfileLoad overlay/default.lua +++ b/Themes/default/BGAnimations/ScreenProfileLoad overlay/default.lua @@ -5,7 +5,7 @@ t[#t+1] = Def.ActorFrame { Name="animation", Texture="LoadScreen diamond 5x2.png", InitCommand=function(self) - self:SetAllStateDelays(0.1):diffusealpha(1):diffuse(color("#6248A7")):Center() + self:SetAllStateDelays(0.1):diffusealpha(1):diffuse(color("#981F41")):Center() end, OnCommand=function(self) self:zoom(0):decelerate(0.25):zoom(0.5) diff --git a/Themes/default/BGAnimations/ScreenProfileSave overlay/default.lua b/Themes/default/BGAnimations/ScreenProfileSave overlay/default.lua index f09d1ec0f5..afda090e3a 100644 --- a/Themes/default/BGAnimations/ScreenProfileSave overlay/default.lua +++ b/Themes/default/BGAnimations/ScreenProfileSave overlay/default.lua @@ -5,7 +5,7 @@ t[#t+1] = Def.ActorFrame { Name="animation", Texture="LoadScreen diamond 5x2.png", InitCommand=function(self) - self:SetAllStateDelays(0.1):diffusealpha(1):diffuse(color("#95326F")):Center() + self:SetAllStateDelays(0.1):diffusealpha(1):diffuse(color("#981F41")):Center() end, OnCommand=function(self) self:zoom(0):decelerate(0.25):zoom(0.5) diff --git a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index fc70b35190..f05ed66fff 100644 --- a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -77,9 +77,12 @@ end -- Banner t[#t+1] = LoadActor(THEME:GetPathG("ScreenSelectMusic", "banner overlay")) .. { - InitCommand=cmd(zoom,1;x,SCREEN_CENTER_X-228;y,SCREEN_CENTER_Y-165-11;draworder,47); - OnCommand=cmd(zoomy,0;decelerate,0.3;zoomy,1;); - OffCommand=cmd(decelerate,0.15;zoomx,0;); + InitCommand=cmd(zoom,1;x,SCREEN_CENTER_X-228;y,SCREEN_CENTER_Y-165-11;draworder,47); + OnCommand=function(self) + self:diffuse(StageToColor(curStage)); + self:zoomy(0):decelerate(0.3):zoomy(1); + end; + OffCommand=cmd(decelerate,0.15;zoomx,0;); }; @@ -191,7 +194,7 @@ if not GAMESTATE:IsCourseMode() then -- P1 Difficulty Pane t[#t+1] = Def.ActorFrame { - InitCommand=cmd(visible,GAMESTATE:IsHumanPlayer(PLAYER_1);horizalign,center;x,SCREEN_CENTER_X-210-32;y,SCREEN_CENTER_Y+230+8;); + InitCommand=cmd(visible,GAMESTATE:IsHumanPlayer(PLAYER_1);horizalign,center;x,SCREEN_CENTER_X-210-32;y,SCREEN_CENTER_Y+230+10;); OnCommand=cmd(zoomy,0.8;diffusealpha,0;smooth,0.4;diffusealpha,1;zoomy,1); PlayerJoinedMessageCommand=function(self,param) if param.Player == PLAYER_1 then @@ -300,7 +303,7 @@ t[#t+1] = Def.ActorFrame { -- P2 Difficulty Pane t[#t+1] = Def.ActorFrame { - InitCommand=cmd(visible,GAMESTATE:IsHumanPlayer(PLAYER_2);horizalign,center;x,SCREEN_CENTER_X+210+32;y,SCREEN_CENTER_Y+230+8;); + InitCommand=cmd(visible,GAMESTATE:IsHumanPlayer(PLAYER_2);horizalign,center;x,SCREEN_CENTER_X+210+32;y,SCREEN_CENTER_Y+230+10;); OnCommand=cmd(zoomy,0.8;diffusealpha,0;smooth,0.4;diffusealpha,1;zoomy,1); PlayerJoinedMessageCommand=function(self,param) if param.Player == PLAYER_2 then @@ -414,7 +417,6 @@ t[#t+1] = StandardDecorationFromFileOptional("PaneDisplayTextP2","PaneDisplayTex t[#t+1] = StandardDecorationFromTable("PercentScore"..ToEnumShortString(PLAYER_1), PercentScore(PLAYER_1)); t[#t+1] = StandardDecorationFromTable("PercentScore"..ToEnumShortString(PLAYER_2), PercentScore(PLAYER_2)); - end; -- BPMDisplay diff --git a/Themes/default/BGAnimations/ScreenSelectMusic in.lua b/Themes/default/BGAnimations/ScreenSelectMusic in.lua index 0321aac83d..55a1b8bd7a 100644 --- a/Themes/default/BGAnimations/ScreenSelectMusic in.lua +++ b/Themes/default/BGAnimations/ScreenSelectMusic in.lua @@ -1,5 +1,5 @@ local transition_params = { - color = color("#005A9D"), + color = color("#882D47"), transition_type = "in" } diff --git a/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua b/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua index 1fbc9dab35..1e7050ace5 100644 --- a/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua +++ b/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua @@ -7,7 +7,7 @@ t[#t+1] = Def.ActorFrame { LoadActor(THEME:GetPathG("", "_sortFrame")) .. { InitCommand=cmd(diffusealpha,0.9;zoom,1.5); OnCommand=function(self) - self:diffuse(ScreenColor(SCREENMAN:GetTopScreen():GetName())); + self:diffuse(ColorMidTone(ScreenColor(SCREENMAN:GetTopScreen():GetName()))); end }; @@ -42,4 +42,32 @@ t[#t+1] = Def.ActorFrame { }; }; +if not GAMESTATE:IsCourseMode() then +-- CD title +t[#t+1] = Def.ActorFrame { + Def.Sprite { + name="CDTitle"; + InitCommand=cmd(x,SCREEN_CENTER_X-40;y,SCREEN_CENTER_Y-140;zoom,0.75;); + OnCommand=cmd(zoomy,0.3;diffusealpha,0;decelerate,0.3;zoomy,0.75;diffusealpha,1); + OffCommand=cmd(decelerate,0.3;zoomy,0.3;diffusealpha,0;); + CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); + SetCommand=function(self) + local song = GAMESTATE:GetCurrentSong(); + if song then + if song:HasCDTitle() then + self:Load(song:GetCDTitlePath()) + self:visible(true) + else + self:Load(nil) + self:visible(false) + end + else + self:Load(nil) + self:visible(false) + end + end; + }; +}; +end; + return t \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenSelectPlayMode out.redir b/Themes/default/BGAnimations/ScreenSelectPlayMode in.redir similarity index 100% rename from Themes/default/BGAnimations/ScreenSelectPlayMode out.redir rename to Themes/default/BGAnimations/ScreenSelectPlayMode in.redir diff --git a/Themes/default/BGAnimations/ScreenSelectPlayMode out.lua b/Themes/default/BGAnimations/ScreenSelectPlayMode out.lua new file mode 100644 index 0000000000..49dd9285e6 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenSelectPlayMode out.lua @@ -0,0 +1,6 @@ +local transition_params = { + color = color("#882D47"), + transition_type = "out" +} + +return LoadActor(THEME:GetPathB("", "_transition"), transition_params) \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenSelectProfile out.lua b/Themes/default/BGAnimations/ScreenSelectProfile out.lua new file mode 100644 index 0000000000..2f40ed9cb8 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenSelectProfile out.lua @@ -0,0 +1,6 @@ +local transition_params = { + color = color("#000000"), + transition_type = "out" +} + +return LoadActor(THEME:GetPathB("", "_transition"), transition_params) \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenSelectProfile overlay.lua b/Themes/default/BGAnimations/ScreenSelectProfile overlay.lua index 60e616a646..089f8b1807 100644 --- a/Themes/default/BGAnimations/ScreenSelectProfile overlay.lua +++ b/Themes/default/BGAnimations/ScreenSelectProfile overlay.lua @@ -12,12 +12,12 @@ function GetLocalProfiles() InitCommand=cmd(zoomto,200,1;y,40/2); OnCommand=cmd(diffuse,Color('Outline');); }; --]] - LoadFont("Common Condensed") .. { - Text=profile:GetDisplayName(); - InitCommand=cmd(shadowlength,1;y,-10;zoom,1;ztest,true); - }; LoadFont("Common Fallback") .. { - InitCommand=cmd(shadowlength,1;y,8;zoom,0.5;vertspacing,-8;ztest,true); + Text=profile:GetDisplayName(); + InitCommand=cmd(shadowlength,1;y,-12;zoom,1;strokecolor,color("#000000");ztest,true); + }; + LoadFont("Common Condensed") .. { + InitCommand=cmd(shadowlength,1;y,10;zoom,0.7;vertspacing,-8;ztest,true); BeginCommand=function(self) local numSongsPlayed = profile:GetNumTotalSongsPlayed(); self:settext( string.format( GetSongsPlayedString( numSongsPlayed ), numSongsPlayed ) ) @@ -32,10 +32,10 @@ end; function LoadCard(cColor) local t = Def.ActorFrame { - Def.Quad { - InitCommand=cmd(zoomto,300,SCREEN_HEIGHT/1.3;y,20;diffuse,ColorDarkTone(cColor);diffusealpha,0.8;fadetop,0.2;fadebottom,0.2) - } - } + LoadActor( THEME:GetPathG("ScreenSelectProfile","CardBackground") ) .. { + InitCommand=cmd(diffuse,ColorMidTone(cColor)); + }; + }; return t end function LoadPlayerStuff(Player) @@ -48,7 +48,7 @@ function LoadPlayerStuff(Player) }; --]] t[#t+1] = Def.ActorFrame { Name = 'JoinFrame'; - LoadCard(Color('Orange')); + LoadCard(color('#882D47')); --[[ Def.Quad { InitCommand=cmd(zoomto,200+4,230+4); OnCommand=cmd(shadowlength,1;diffuse,color("0,0,0,0.5")); @@ -58,9 +58,9 @@ function LoadPlayerStuff(Player) OnCommand=cmd(diffuse,Color('Orange');diffusealpha,0.5); }; --]] LoadFont("Common Italic Condensed") .. { - Text="Press &START; to join."; + Text="Press &START; to join"; InitCommand=cmd(shadowlength,1;zoom,1.25); - OnCommand=cmd(diffuseshift;effectcolor1,Color('White');effectcolor2,color("0.5,0.5,0.5")); + OnCommand=cmd(diffuseshift;effectcolor1,Color('White');effectcolor2,color("0.5,0.5,0.5");strokecolor,color("#4A1110");); }; }; @@ -72,8 +72,8 @@ function LoadPlayerStuff(Player) Name = 'SmallFrame'; InitCommand=cmd(y,-2); Def.Quad { - InitCommand=cmd(zoomto,300,40); - OnCommand=cmd(diffuse,PlayerColor(Player);fadeleft,0.25;faderight,0.25); + InitCommand=cmd(zoomto,270,48); + OnCommand=cmd(diffuse,PlayerDarkColor(Player);fadeleft,0.1;faderight,0.1;); }; }; @@ -86,7 +86,7 @@ function LoadPlayerStuff(Player) TransformFunction=function(self, offset, itemIndex, numItems) local focus = scale(math.abs(offset),0,2,1,0); self:visible(false); - self:y(math.floor( offset*40 )); + self:y(math.floor( offset*48 )); -- self:zoomy( focus ); -- self:z(-math.abs(offset)); -- self:zoom(focus); @@ -97,9 +97,9 @@ function LoadPlayerStuff(Player) t[#t+1] = Def.ActorFrame { Name = "EffectFrame"; }; - t[#t+1] = LoadFont("Common Condensed") .. { + t[#t+1] = LoadFont("Common Fallback") .. { Name = 'SelectedProfileText'; - InitCommand=cmd(y,160;shadowlength,1;diffuse,ColorLightTone(PlayerColor(Player));diffusebottomedge,color("#FFFFFF");zoom,1.25); + InitCommand=cmd(y,160;shadowlength,1;diffuse,color("#FFFFFF");strokecolor,ColorDarkTone(PlayerColor(Player));diffusebottomedge,color("#FFFFFF");zoom,1.25); }; return t; diff --git a/Themes/default/BGAnimations/ScreenSelectStyle out.redir b/Themes/default/BGAnimations/ScreenSelectStyle out.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenSelectStyle out.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua b/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua index 1a61653edf..99c6383e03 100644 --- a/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua @@ -32,7 +32,7 @@ end -- BG for credits t[#t+1] = Def.ActorFrame { - OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240); + OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,0.75); -- Behind stage graphic Def.Quad { InitCommand=cmd(vertalign,bottom;x,SCREEN_CENTER_X;y,SCREEN_BOTTOM-110;zoomto,SCREEN_WIDTH,120;); @@ -70,7 +70,7 @@ end t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+190); - OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240;); + OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,0.75;); stage_num_actor .. { OnCommand=cmd(zoom,1;diffusealpha,1); @@ -81,7 +81,7 @@ t[#t+1] = Def.ActorFrame { if GAMESTATE:IsHumanPlayer(PLAYER_1) == true then t[#t+1] = Def.ActorFrame { InitCommand=cmd(y,SCREEN_BOTTOM-80;x,SCREEN_LEFT+40;); - OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240;); + OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;); LoadFont("Common Italic Condensed") .. { OnCommand=cmd(playcommand,"Set";horizalign,left;diffuse,color("#FFFFFF");); SetCommand=function(self) @@ -121,7 +121,7 @@ t[#t+1] = Def.ActorFrame { if GAMESTATE:IsHumanPlayer(PLAYER_2) == true then t[#t+1] = Def.ActorFrame { InitCommand=cmd(y,SCREEN_BOTTOM-80;x,SCREEN_RIGHT-40;); - OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240;); + OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,0.75;); LoadFont("Common Italic Condensed") .. { OnCommand=cmd(playcommand,"Set";horizalign,right;diffuse,color("#FFFFFF");); SetCommand=function(self) @@ -163,7 +163,7 @@ t[#t+1] = Def.ActorFrame { -- Song title and artist t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_BOTTOM-80); - OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240;); + OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,0.75); LoadFont("Common Fallback Font") .. { Text=GAMESTATE:IsCourseMode() and GAMESTATE:GetCurrentCourse():GetDisplayFullTitle() or GAMESTATE:GetCurrentSong():GetDisplayFullTitle(); InitCommand=cmd(diffuse,color("#FFFFFF");maxwidth,SCREEN_WIDTH*0.6); diff --git a/Themes/default/BGAnimations/ScreenTitleMenu background/_particle normal.png b/Themes/default/BGAnimations/ScreenTitleMenu background/_particle normal.png index fb0e9d36e3..30d3d6c9e9 100644 Binary files a/Themes/default/BGAnimations/ScreenTitleMenu background/_particle normal.png and b/Themes/default/BGAnimations/ScreenTitleMenu background/_particle normal.png differ diff --git a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua index a8a5c8345b..4c8b190309 100644 --- a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua +++ b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua @@ -10,11 +10,11 @@ if ThemePrefs.Get("FancyUIBG") then }, LoadActor("_barcode") .. { - InitCommand=cmd(zoomto,36,1024;blend,'BlendMode_Add';x,SCREEN_LEFT+36;y,SCREEN_CENTER_Y;diffusealpha,0.08); + InitCommand=cmd(zoomto,36,1024;blend,'BlendMode_Add';x,SCREEN_LEFT+6;y,SCREEN_CENTER_Y;diffusealpha,0.08); OnCommand=cmd(customtexturerect,0,0,1,1;texcoordvelocity,0,-0.1); }; LoadActor("_barcode") .. { - InitCommand=cmd(zoomto,36,1024;blend,'BlendMode_Add';x,SCREEN_RIGHT-36;y,SCREEN_CENTER_Y;diffusealpha,0.08); + InitCommand=cmd(zoomto,36,1024;blend,'BlendMode_Add';x,SCREEN_RIGHT-6;y,SCREEN_CENTER_Y;diffusealpha,0.08); OnCommand=cmd(customtexturerect,0,0,1,1;texcoordvelocity,0,0.1); }; diff --git a/Themes/default/BGAnimations/_frame files 3x1/rounded light 3x1.png b/Themes/default/BGAnimations/_frame files 3x1/rounded light 3x1.png index b6ae5fbda5..658c7680f3 100644 Binary files a/Themes/default/BGAnimations/_frame files 3x1/rounded light 3x1.png and b/Themes/default/BGAnimations/_frame files 3x1/rounded light 3x1.png differ diff --git a/Themes/default/Graphics/Banner AllCourses.png b/Themes/default/Graphics/Banner AllCourses.png index cc3293edad..2549427c7b 100644 Binary files a/Themes/default/Graphics/Banner AllCourses.png and b/Themes/default/Graphics/Banner AllCourses.png differ diff --git a/Themes/default/Graphics/Banner all music.png b/Themes/default/Graphics/Banner all music.png index bda81c31d7..1103065c2b 100644 Binary files a/Themes/default/Graphics/Banner all music.png and b/Themes/default/Graphics/Banner all music.png differ diff --git a/Themes/default/Graphics/Banner mode.png b/Themes/default/Graphics/Banner mode.png index 223d69f361..e834c9ca75 100644 Binary files a/Themes/default/Graphics/Banner mode.png and b/Themes/default/Graphics/Banner mode.png differ diff --git a/Themes/default/Graphics/Banner preferred.png b/Themes/default/Graphics/Banner preferred.png index ef6db4a178..d268027bc7 100644 Binary files a/Themes/default/Graphics/Banner preferred.png and b/Themes/default/Graphics/Banner preferred.png differ diff --git a/Themes/default/Graphics/Common fallback background.png b/Themes/default/Graphics/Common fallback background.png index 49c2eeb639..9b862d3c7d 100644 Binary files a/Themes/default/Graphics/Common fallback background.png and b/Themes/default/Graphics/Common fallback background.png differ diff --git a/Themes/default/Graphics/Common fallback banner.png b/Themes/default/Graphics/Common fallback banner.png index bdff18c066..21bc9c76c5 100644 Binary files a/Themes/default/Graphics/Common fallback banner.png and b/Themes/default/Graphics/Common fallback banner.png differ diff --git a/Themes/default/Graphics/CourseEntryDisplay bar.png b/Themes/default/Graphics/CourseEntryDisplay bar.png index c48a6c4bb0..2774e02838 100644 Binary files a/Themes/default/Graphics/CourseEntryDisplay bar.png and b/Themes/default/Graphics/CourseEntryDisplay bar.png differ diff --git a/Themes/default/Graphics/HoldJudgment label 1x2.png b/Themes/default/Graphics/HoldJudgment label 1x2.png index 9c7b67f46b..789fe98d83 100644 Binary files a/Themes/default/Graphics/HoldJudgment label 1x2.png and b/Themes/default/Graphics/HoldJudgment label 1x2.png differ diff --git a/Themes/default/Graphics/Judgment Normal 2x6.png b/Themes/default/Graphics/Judgment Normal 2x6.png index 28448d9c58..89bb4484ab 100644 Binary files a/Themes/default/Graphics/Judgment Normal 2x6.png and b/Themes/default/Graphics/Judgment Normal 2x6.png differ diff --git a/Themes/default/Graphics/LifeMeter bar frame.png b/Themes/default/Graphics/LifeMeter bar frame.png index 2d51ee8ebd..223ca4c758 100644 Binary files a/Themes/default/Graphics/LifeMeter bar frame.png and b/Themes/default/Graphics/LifeMeter bar frame.png differ diff --git a/Themes/default/Graphics/MusicWheel highlight.png b/Themes/default/Graphics/MusicWheel highlight.png index 75a85f2515..92f2be2495 100644 Binary files a/Themes/default/Graphics/MusicWheel highlight.png and b/Themes/default/Graphics/MusicWheel highlight.png differ diff --git a/Themes/default/Graphics/MusicWheelItem Course NormalPart.png b/Themes/default/Graphics/MusicWheelItem Course NormalPart.png index debe5e0a36..4b2a69c0bc 100644 Binary files a/Themes/default/Graphics/MusicWheelItem Course NormalPart.png and b/Themes/default/Graphics/MusicWheelItem Course NormalPart.png differ diff --git a/Themes/default/Graphics/MusicWheelItem Random NormalPart.png b/Themes/default/Graphics/MusicWheelItem Random NormalPart.png index f6ae817560..28ba5001c8 100644 Binary files a/Themes/default/Graphics/MusicWheelItem Random NormalPart.png and b/Themes/default/Graphics/MusicWheelItem Random NormalPart.png differ diff --git a/Themes/default/Graphics/MusicWheelItem Roulette NormalPart.png b/Themes/default/Graphics/MusicWheelItem Roulette NormalPart.png index 1bd664f206..308b78b41d 100644 Binary files a/Themes/default/Graphics/MusicWheelItem Roulette NormalPart.png and b/Themes/default/Graphics/MusicWheelItem Roulette NormalPart.png differ diff --git a/Themes/default/Graphics/MusicWheelItem SectionCollapsed NormalPart.png b/Themes/default/Graphics/MusicWheelItem SectionCollapsed NormalPart.png index ae0e900384..1f068f81a0 100644 Binary files a/Themes/default/Graphics/MusicWheelItem SectionCollapsed NormalPart.png and b/Themes/default/Graphics/MusicWheelItem SectionCollapsed NormalPart.png differ diff --git a/Themes/default/Graphics/MusicWheelItem SectionExpanded NormalPart.png b/Themes/default/Graphics/MusicWheelItem SectionExpanded NormalPart.png index 3330c371da..bdb80e50fa 100644 Binary files a/Themes/default/Graphics/MusicWheelItem SectionExpanded NormalPart.png and b/Themes/default/Graphics/MusicWheelItem SectionExpanded NormalPart.png differ diff --git a/Themes/default/Graphics/MusicWheelItem Song NormalPart.png b/Themes/default/Graphics/MusicWheelItem Song NormalPart.png index b5f4222443..00e2c50341 100644 Binary files a/Themes/default/Graphics/MusicWheelItem Song NormalPart.png and b/Themes/default/Graphics/MusicWheelItem Song NormalPart.png differ diff --git a/Themes/default/Graphics/MusicWheelItem grades/grades 2x8.png b/Themes/default/Graphics/MusicWheelItem grades/grades 2x8.png index fe861513df..9ff52c5b8c 100644 Binary files a/Themes/default/Graphics/MusicWheelItem grades/grades 2x8.png and b/Themes/default/Graphics/MusicWheelItem grades/grades 2x8.png differ diff --git a/Themes/default/Graphics/OptionRowExit frame (doubleres).png b/Themes/default/Graphics/OptionRowExit frame (doubleres).png index ce7b1d57a2..f8eeeda5b8 100644 Binary files a/Themes/default/Graphics/OptionRowExit frame (doubleres).png and b/Themes/default/Graphics/OptionRowExit frame (doubleres).png differ diff --git a/Themes/default/Graphics/ScoreDisplayNormal frame.png b/Themes/default/Graphics/ScoreDisplayNormal frame.png index 6b0dc0fa13..54d1dc1d6b 100644 Binary files a/Themes/default/Graphics/ScoreDisplayNormal frame.png and b/Themes/default/Graphics/ScoreDisplayNormal frame.png differ diff --git a/Themes/default/Graphics/ScreenGameplay progress.png b/Themes/default/Graphics/ScreenGameplay progress.png index a47060fa3d..683145ec5e 100644 Binary files a/Themes/default/Graphics/ScreenGameplay progress.png and b/Themes/default/Graphics/ScreenGameplay progress.png differ diff --git a/Themes/default/Graphics/ScreenHighScores ScrollerItem/frame.png b/Themes/default/Graphics/ScreenHighScores ScrollerItem/frame.png index 0a9b24bd56..992737317e 100644 Binary files a/Themes/default/Graphics/ScreenHighScores ScrollerItem/frame.png and b/Themes/default/Graphics/ScreenHighScores ScrollerItem/frame.png differ diff --git a/Themes/default/Graphics/ScreenMiniMenu page.png b/Themes/default/Graphics/ScreenMiniMenu page.png index b23f3c7df6..e5693d2b71 100644 Binary files a/Themes/default/Graphics/ScreenMiniMenu page.png and b/Themes/default/Graphics/ScreenMiniMenu page.png differ diff --git a/Themes/default/Graphics/ScreenOptions page.png b/Themes/default/Graphics/ScreenOptions page.png index 852fe4ee5e..678d7dc26a 100644 Binary files a/Themes/default/Graphics/ScreenOptions page.png and b/Themes/default/Graphics/ScreenOptions page.png differ diff --git a/Themes/default/Graphics/ScreenPlayerOptions PlayerNameplate.lua b/Themes/default/Graphics/ScreenPlayerOptions PlayerNameplate.lua index 729ce499d8..9e2e7179f7 100644 --- a/Themes/default/Graphics/ScreenPlayerOptions PlayerNameplate.lua +++ b/Themes/default/Graphics/ScreenPlayerOptions PlayerNameplate.lua @@ -23,7 +23,7 @@ end local t = Def.ActorFrame { LoadActor(THEME:GetPathB("_frame","3x1"),"rounded light", 250-16) .. { - OnCommand=cmd(diffuse,ColorLightTone(PlayerColor(PlayerNumber));diffusealpha,0.5); + OnCommand=cmd(diffuse,ColorLightTone(PlayerColor(PlayerNumber));diffusealpha,0.8); }; LoadFont("Common Condensed") .. { Text=ToEnumShortString(PlayerNumber); diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua b/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua index eede32ed6d..79cb8cf161 100644 --- a/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua +++ b/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua @@ -20,7 +20,7 @@ return Def.ActorFrame { self:decelerate(0.3):zoomx(0):diffusealpha(0) end; CursorP1 = Def.ActorFrame { - InitCommand=cmd(x,-170;player,PLAYER_1); + InitCommand=cmd(x,-174;player,PLAYER_1); PlayerJoinedMessageCommand=function(self, params) if params.Player == PLAYER_1 then self:visible(true); @@ -43,7 +43,7 @@ return Def.ActorFrame { }; }; CursorP2 = Def.ActorFrame { - InitCommand=cmd(x,170;player,PLAYER_2); + InitCommand=cmd(x,174;player,PLAYER_2); PlayerJoinedMessageCommand=function(self, params) if params.Player == PLAYER_2 then self:visible(true); diff --git a/Themes/default/Graphics/ScreenSelectMusic banner overlay.png b/Themes/default/Graphics/ScreenSelectMusic banner overlay.png index fcb31b1401..6118197a8d 100644 Binary files a/Themes/default/Graphics/ScreenSelectMusic banner overlay.png and b/Themes/default/Graphics/ScreenSelectMusic banner overlay.png differ diff --git a/Themes/default/Graphics/ScreenSelectMusic info pane.png b/Themes/default/Graphics/ScreenSelectMusic info pane.png index e802e03be5..44859e847e 100644 Binary files a/Themes/default/Graphics/ScreenSelectMusic info pane.png and b/Themes/default/Graphics/ScreenSelectMusic info pane.png differ diff --git a/Themes/default/Graphics/ScreenSelectMusic pane background.png b/Themes/default/Graphics/ScreenSelectMusic pane background.png index 17fa96b726..e3a7ef1a47 100644 Binary files a/Themes/default/Graphics/ScreenSelectMusic pane background.png and b/Themes/default/Graphics/ScreenSelectMusic pane background.png differ diff --git a/Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua b/Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua index aca4c418cb..246a576331 100644 --- a/Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua +++ b/Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua @@ -12,22 +12,22 @@ t[#t+1] = Def.ActorFrame { OffCommand=cmd(decelerate,0.2;zoom,0.7;diffusealpha,0), LoadActor("_background base") .. { - LoseFocusCommand=cmd(diffuse,ColorMidTone(icon_color)), - GainFocusCommand=cmd(diffuse,icon_color) + LoseFocusCommand=cmd(diffuse,icon_color), + GainFocusCommand=cmd(diffuse,ColorLightTone(icon_color)), }, LoadActor( gc:GetName() ) .. { InitCommand=cmd(addy,-20;diffuse,Color.Black), GainFocusCommand=cmd(diffusealpha,1.0), - LoseFocusCommand=cmd(diffusealpha,0.7) + LoseFocusCommand=cmd(diffusealpha,0.4) }, -- todo: generate a better font for these. LoadFont("_overpass 48px")..{ Text=string.upper(gc:GetText()), InitCommand=cmd(horizalign,center;y,icon_size/3.4;zoom,0.5;maxwidth,icon_size*1.3;diffusecolor,color("#000000")), - GainFocusCommand=cmd(diffusealpha,0.8), - LoseFocusCommand=cmd(diffusealpha,0.6) + GainFocusCommand=cmd(diffusealpha,1), + LoseFocusCommand=cmd(diffusealpha,0.5) }, -- Will this ever actually be used? @@ -38,7 +38,7 @@ t[#t+1] = Def.ActorFrame { LoadActor("_highlight") .. { LoseFocusCommand=cmd(stopeffect;decelerate,0.1;diffuse,Color.Invisible), - GainFocusCommand=cmd(decelerate,0.2;diffuse,Color.White;diffuseshift;effectcolor1,Color.White;effectcolor2,color("#FFFFFF99")) + GainFocusCommand=cmd(decelerate,0.2;diffuse,Color.Black;diffuseshift;effectcolor1,Color.White;effectcolor2,color("#FFFFFF99")) } } return t \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenSelectProfile CardBackground (doubleres).png b/Themes/default/Graphics/ScreenSelectProfile CardBackground (doubleres).png new file mode 100644 index 0000000000..d1262cc5e5 Binary files /dev/null and b/Themes/default/Graphics/ScreenSelectProfile CardBackground (doubleres).png differ diff --git a/Themes/default/Graphics/ScreenSelectStyle Icon.lua b/Themes/default/Graphics/ScreenSelectStyle Icon.lua index 8915d6efde..1b942054e9 100644 --- a/Themes/default/Graphics/ScreenSelectStyle Icon.lua +++ b/Themes/default/Graphics/ScreenSelectStyle Icon.lua @@ -11,8 +11,8 @@ t[#t+1] = Def.ActorFrame { LoseFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconLoseFocusCommand"); LoadActor(THEME:GetPathG("ScreenSelectPlayMode", "icon/_background base"))..{ - GainFocusCommand=cmd(diffuse,color("#57213B");diffusetopedge,color("#80385B");); - LoseFocusCommand=cmd(diffuse,color("#57213B")); + GainFocusCommand=cmd(diffuse,color("#981F41");); + LoseFocusCommand=cmd(diffuse,color("#740A27");); }; LoadFont("_overpass 36px")..{ Text=string.upper(string_name); diff --git a/Themes/default/Graphics/ScreenTitleMenu CurrentGametype.lua b/Themes/default/Graphics/ScreenTitleMenu CurrentGametype.lua index c25f08aa76..9675faf236 100644 --- a/Themes/default/Graphics/ScreenTitleMenu CurrentGametype.lua +++ b/Themes/default/Graphics/ScreenTitleMenu CurrentGametype.lua @@ -1,5 +1,5 @@ local icon_params = { - base_color = color("#CC2E3C"), + base_color = color("#981F41"), label_text = Screen.String("CurrentGametype"), value_text = GAMESTATE:GetCurrentGame():GetName() } diff --git a/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua b/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua index 8f060103b1..379d623131 100644 --- a/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua +++ b/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua @@ -1,5 +1,5 @@ local icon_params = { - base_color = color("#F51319"), + base_color = color("#981F41"), label_text = Screen.String("LifeDifficulty"), value_text = GetLifeDifficulty() } diff --git a/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua b/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua index ee4661807e..cb666a0b26 100644 --- a/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua +++ b/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua @@ -1,5 +1,5 @@ local icon_params = { - base_color = color("#CE3D06"), + base_color = color("#981F41"), label_text = Screen.String("TimingDifficulty"), value_text = GetTimingDifficulty() == 9 and Screen.String("Hardest Timing") or GetTimingDifficulty() } diff --git a/Themes/default/Graphics/ScreenWithMenuElements Footer.lua b/Themes/default/Graphics/ScreenWithMenuElements Footer.lua index 0317e4ac65..a140e8b1a2 100644 --- a/Themes/default/Graphics/ScreenWithMenuElements Footer.lua +++ b/Themes/default/Graphics/ScreenWithMenuElements Footer.lua @@ -2,7 +2,7 @@ local t = Def.ActorFrame {}; t[#t+1] = Def.ActorFrame { Def.Quad { - InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,5;addy,-50;diffuse,Color("Black");fadetop,1;diffusealpha,0.8); + InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,5;addy,-50;diffuse,Color("Black");fadetop,1;diffusealpha,1); }; }; @@ -11,7 +11,7 @@ t[#t+1] = Def.ActorFrame { InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,50;); OnCommand=function(self) self:diffuse(ColorMidTone(ScreenColor(SCREENMAN:GetTopScreen():GetName()))) - self:diffusetopedge(ColorDarkTone(ScreenColor(SCREENMAN:GetTopScreen():GetName()))):diffusealpha(0.8) + self:diffusetopedge(ColorDarkTone(ScreenColor(SCREENMAN:GetTopScreen():GetName()))):diffusealpha(1) end; }; }; diff --git a/Themes/default/Graphics/ScreenWithMenuElements header/ScreenNetRoom icon.png b/Themes/default/Graphics/ScreenWithMenuElements header/ScreenNetRoom icon.png index 5bff360dc0..9628466f2f 100644 Binary files a/Themes/default/Graphics/ScreenWithMenuElements header/ScreenNetRoom icon.png and b/Themes/default/Graphics/ScreenWithMenuElements header/ScreenNetRoom icon.png differ diff --git a/Themes/default/Graphics/ScreenWithMenuElements header/ScreenNetSelectMusic icon.png b/Themes/default/Graphics/ScreenWithMenuElements header/ScreenNetSelectMusic icon.png index 5bff360dc0..9fbe4f5c66 100644 Binary files a/Themes/default/Graphics/ScreenWithMenuElements header/ScreenNetSelectMusic icon.png and b/Themes/default/Graphics/ScreenWithMenuElements header/ScreenNetSelectMusic icon.png differ diff --git a/Themes/default/Graphics/ScreenWithMenuElements header/ScreenSMOnlineLogin icon.png b/Themes/default/Graphics/ScreenWithMenuElements header/ScreenSMOnlineLogin icon.png index 5bff360dc0..d9dc465326 100644 Binary files a/Themes/default/Graphics/ScreenWithMenuElements header/ScreenSMOnlineLogin icon.png and b/Themes/default/Graphics/ScreenWithMenuElements header/ScreenSMOnlineLogin icon.png differ diff --git a/Themes/default/Graphics/ScreenWithMenuElements header/default.lua b/Themes/default/Graphics/ScreenWithMenuElements header/default.lua index c52efb73d5..cc2eec2c9d 100644 --- a/Themes/default/Graphics/ScreenWithMenuElements header/default.lua +++ b/Themes/default/Graphics/ScreenWithMenuElements header/default.lua @@ -10,13 +10,13 @@ t[#t+1] = Def.ActorFrame { Def.Quad { InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,96), OnCommand=function(self) - self:diffuse(ScreenColor(SCREENMAN:GetTopScreen():GetName())):diffusetopedge(ColorDarkTone(ScreenColor(SCREENMAN:GetTopScreen():GetName()))):diffusealpha(0.8) + self:diffuse(ScreenColor(SCREENMAN:GetTopScreen():GetName())):diffusebottomedge(ColorDarkTone(ScreenColor(SCREENMAN:GetTopScreen():GetName()))):diffusealpha(1) end }, LoadActor("_shade") .. { InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,96), OnCommand=function(self) - self:diffuse(ScreenColor(SCREENMAN:GetTopScreen():GetName())):diffusetopedge(ColorDarkTone(ScreenColor(SCREENMAN:GetTopScreen():GetName()))):diffusealpha(0.8):faderight(1) + self:diffuse(ScreenColor(SCREENMAN:GetTopScreen():GetName())):diffusebottomedge(ColorDarkTone(ScreenColor(SCREENMAN:GetTopScreen():GetName()))):diffusealpha(0.8):faderight(1) end }, -- Shadow @@ -62,7 +62,7 @@ t[#t+1] = Def.ActorFrame { t[#t+1] = LoadFont("Common Header") .. { Name="HeaderTitle", Text=Screen.String("HeaderText"), - InitCommand=cmd(zoom,1.0;x,-SCREEN_CENTER_X+110;y,49;horizalign,left;diffuse,color("#ffffff");shadowlength,1;skewx,-0.1), + InitCommand=cmd(zoom,1.0;x,-SCREEN_CENTER_X+110;y,49;horizalign,left;diffuse,color("#ffffff");shadowlength,1;), OnCommand=cmd(diffusealpha,0;sleep,0.5;smooth,0.3;diffusealpha,0.8), UpdateScreenHeaderMessageCommand=function(self,param) self:settext(param.Header) diff --git a/Themes/default/Graphics/StepsDisplayListRow autogen.png b/Themes/default/Graphics/StepsDisplayListRow autogen.png index e41d7c4a44..57bd7a1b93 100644 Binary files a/Themes/default/Graphics/StepsDisplayListRow autogen.png and b/Themes/default/Graphics/StepsDisplayListRow autogen.png differ diff --git a/Themes/default/Graphics/StepsDisplayListRow frame.png b/Themes/default/Graphics/StepsDisplayListRow frame.png index 9fea26dfb5..a47410ff93 100644 Binary files a/Themes/default/Graphics/StepsDisplayListRow frame.png and b/Themes/default/Graphics/StepsDisplayListRow frame.png differ diff --git a/Themes/default/Graphics/_StepsDisplayListRow Cursor.png b/Themes/default/Graphics/_StepsDisplayListRow Cursor.png index cb1e46840b..a6fbe631cd 100644 Binary files a/Themes/default/Graphics/_StepsDisplayListRow Cursor.png and b/Themes/default/Graphics/_StepsDisplayListRow Cursor.png differ diff --git a/Themes/default/Graphics/_combined life frame (doubleres).png b/Themes/default/Graphics/_combined life frame (doubleres).png index 34db8cb739..607994d8e5 100644 Binary files a/Themes/default/Graphics/_combined life frame (doubleres).png and b/Themes/default/Graphics/_combined life frame (doubleres).png differ diff --git a/Themes/default/Graphics/_sortFrame.png b/Themes/default/Graphics/_sortFrame.png deleted file mode 100644 index 6af3ce362a..0000000000 Binary files a/Themes/default/Graphics/_sortFrame.png and /dev/null differ diff --git a/Themes/default/Graphics/_sortFrame.redir b/Themes/default/Graphics/_sortFrame.redir new file mode 100644 index 0000000000..fedcb921e8 --- /dev/null +++ b/Themes/default/Graphics/_sortFrame.redir @@ -0,0 +1 @@ +_stageFrame \ No newline at end of file diff --git a/Themes/default/Graphics/_stageFrame (doubleres).png b/Themes/default/Graphics/_stageFrame (doubleres).png new file mode 100644 index 0000000000..946d3a7673 Binary files /dev/null and b/Themes/default/Graphics/_stageFrame (doubleres).png differ diff --git a/Themes/default/Graphics/_stageFrame.png b/Themes/default/Graphics/_stageFrame.png deleted file mode 100644 index eabdfd83e6..0000000000 Binary files a/Themes/default/Graphics/_stageFrame.png and /dev/null differ diff --git a/Themes/default/Graphics/common bg base.png b/Themes/default/Graphics/common bg base.png index 5093fe206a..58bb9bce8f 100644 Binary files a/Themes/default/Graphics/common bg base.png and b/Themes/default/Graphics/common bg base.png differ diff --git a/Themes/default/Scripts/02 Colors.lua b/Themes/default/Scripts/02 Colors.lua index 2bdef845a6..ac5c359b60 100644 --- a/Themes/default/Scripts/02 Colors.lua +++ b/Themes/default/Scripts/02 Colors.lua @@ -25,58 +25,58 @@ function ScreenColor(screen) end; ScreenColors = { - Style = color("#81468B"), - PlayMode = color("#b2350c"), - Music = color("#1268aa"), - Online = color("#1CA6A0"), - Course = color("#6D1646"), - PlayerOptions = color("#544abe"), - OptionsService = color("#5F2D41"), - Evaluation = color("#806635"), - Summary = color("#B38D47"), + Style = color("#882D47"), + PlayMode = color("#882D47"), + Music = color("#882D47"), + Online = color("#882D47"), + Course = color("#882D47"), + PlayerOptions = color("#882D47"), + OptionsService = color("#882D47"), + Evaluation = color("#882D47"), + Summary = color("#882D47"), StageInformation = color("#D05722"), Edit = color("#B34754"), - Default = color("#5F2D41"), + Default = color("#882D47"), } ModeIconColors = { - Normal = color("#339FF2"), - Rave = color("#6BFF90"), - Nonstop = color("#FF66AB"), - Oni = color("#FF714D"), - Endless = color("#6A62CA"), + Normal = color("#1AE0E4"), + Rave = color("#3ACF2A"), + Nonstop = color("#CFC42A"), + Oni = color("#CF502A"), + Endless = color("#981F41"), } GameColor = { PlayerColors = { - PLAYER_1 = color("#3982FF"), - PLAYER_2 = color("#FF4596"), + PLAYER_1 = color("#4B82DC"), + PLAYER_2 = color("#DF4C47"), both = color("#FFFFFF"), }, PlayerDarkColors = { - PLAYER_1 = color("#023C9F"), - PLAYER_2 = color("#7F083C"), + PLAYER_1 = color("#16386E"), + PLAYER_2 = color("#65110F"), both = color("#F5E1E1"), }, Difficulty = { --[[ These are for 'Custom' Difficulty Ranks. It can be very useful in some cases, especially to apply new colors for stuff you couldn't before. (huh? -aj) ]] - Beginner = color("#A165CE"), -- purple - Easy = color("#50DA1A"), -- green - Medium = color("#FFE53E"), -- yellow - Hard = color("#FE4F49"), -- orange - Challenge = color("#2DDBFF"), -- light blue - Edit = color("0.8,0.8,0.8,1"), -- gray + Beginner = color("#1AE0E4"), -- Mint + Easy = color("#3ACF2A"), -- Green + Medium = color("#CFC42A"), -- Yellow + Hard = color("#CF502A"), -- Orange + Challenge = color("#981F41"), -- Plum + Edit = color("0.8,0.8,0.8,1"), -- Gray Couple = color("#ed0972"), -- hot pink Routine = color("#ff9a00"), -- orange --[[ These are for courses, so let's slap them here in case someone wanted to use Difficulty in Course and Step regions. ]] - Difficulty_Beginner = color("#A165CE"), -- purple - Difficulty_Easy = color("#50DA1A"), -- green - Difficulty_Medium = color("#FFE53E"), -- yellow - Difficulty_Hard = color("#FE4F49"), -- orange - Difficulty_Challenge = color("#2DDBFF"), -- light blue + Difficulty_Beginner = color("#1AE0E4"), -- Mint + Difficulty_Easy = color("#2FA74D"), -- Green + Difficulty_Medium = color("#CFC42A"), -- Yellow + Difficulty_Hard = color("#CF502A"), -- Orange + Difficulty_Challenge = color("#981F41"), -- Plum Difficulty_Edit = color("0.8,0.8,0.8,1"), -- gray Difficulty_Couple = color("#ed0972"), -- hot pink Difficulty_Routine = color("#ff9a00") -- orange diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 042d242e21..1e3d5f5e01 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -26,9 +26,9 @@ ExtraColor=color("#F5BCBC") -- purple [ScreenSystemLayer] ShowClock=true -CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,1;shadowlength,1;diffuse,ColorLightTone(PlayerColor(PLAYER_1));diffusetopedge,color("#FFFFFF");strokecolor,ColorMidTone(PlayerColor(PLAYER_1)); +CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,1;shadowlength,1;diffuse,color("#FFFFFF");strokecolor,ColorDarkTone(PlayerColor(PLAYER_1)); # -CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,1;shadowlength,1;diffuse,ColorLightTone(PlayerColor(PLAYER_2));diffusetopedge,color("#FFFFFF");strokecolor,ColorMidTone(PlayerColor(PLAYER_2)); +CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,1;shadowlength,1;diffuse,color("#FFFFFF");strokecolor,ColorDarkTone(PlayerColor(PLAYER_2)); # @@ -406,14 +406,14 @@ RightOnCommand=horizalign,left;diffuse,ColorLightTone(PlayerColor(PLAYER_2)) [OptionsUnderline] [OptionsUnderlineP1] -LeftOnCommand=horizalign,right;diffuse,ColorLightTone(PlayerColor(PLAYER_1)) -MiddleOnCommand=;diffuse,ColorLightTone(PlayerColor(PLAYER_1)) -RightOnCommand=horizalign,left;diffuse,ColorLightTone(PlayerColor(PLAYER_1)) +LeftOnCommand=horizalign,right;diffuse,PlayerColor(PLAYER_1) +MiddleOnCommand=;diffuse,PlayerColor(PLAYER_1) +RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_1) [OptionsUnderlineP2] -LeftOnCommand=horizalign,right;diffuse,ColorLightTone(PlayerColor(PLAYER_2)) -MiddleOnCommand=;diffuse,ColorLightTone(PlayerColor(PLAYER_2)) -RightOnCommand=horizalign,left;diffuse,ColorLightTone(PlayerColor(PLAYER_2)) +LeftOnCommand=horizalign,right;diffuse,PlayerColor(PLAYER_2) +MiddleOnCommand=;diffuse,PlayerColor(PLAYER_2) +RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_2) [ScreenOptionsMaster] @@ -593,8 +593,8 @@ IconGainFocusCommand=stoptweening;bounceend,0.05;zoom,1; IconLoseFocusCommand=stoptweening;decelerate,0.1;zoom,0.8; # IconChoicePosFunction=ScreenSelectStylePositions -IconChoiceOnCommand=zoom,0;bounceend,0.35;zoom,1 -IconChoiceOffCommand=linear,0.05;zoomx,0 +IconChoiceOnCommand=diffusealpha,0;linear,0.4;diffusealpha,1 +IconChoiceOffCommand=decelerate,0.2;zoom,0.7;diffusealpha,0 # [ScreenSelectPlayMode] @@ -639,7 +639,7 @@ BannerOffCommand=decelerate,0.2;zoomx,0; # ShowDifficultyList=not GAMESTATE:IsCourseMode(); DifficultyListX=SCREEN_CENTER_X-228 -DifficultyListY=SCREEN_CENTER_Y-31 +DifficultyListY=SCREEN_CENTER_Y-30 DifficultyListOnCommand= DifficultyListStartSelectingStepsMessageCommand= DifficultyListOffCommand= @@ -653,7 +653,7 @@ DifficultyListTweenOffCommand= ShowSongTime=true SongTimeX= SongTimeY=SCREEN_CENTER_Y-78+2 -SongTimeOnCommand=horizalign,left;zoom,1.0;diffuse,color("#DFE2E9") +SongTimeOnCommand=horizalign,left;zoom,1.0;diffuse,color("#DFE2E9");maxwidth,128; ShowBPMDisplay=true BPMDisplayX=SCREEN_CENTER_X-179-63 @@ -713,14 +713,6 @@ PercentScoreP2OnCommand=zoomy,0;zoomx,0.35;sleep,0.8;smooth,0.2;zoomy,0.35 PercentScoreP2OffCommand=smooth,0.2;zoomy,0;addy,-6; NullScoreString=string.format("% 9i",0) # -# -CDTitleX=SCREEN_CENTER_X-160+90 -CDTitleY=SCREEN_TOP+160+(36/2)+8 -CDTitleFrontCommand=diffuse,color('0.5,0.5,0.5,1');cullmode,'CullMode_Front' -CDTitleBackCommand=cullmode,'CullMode_Back' -#CDTitleOnCommand=draworder,106;shadowlength,1;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.1;zoom,0.75;spin;effectmagnitude,0,180,0; -CDTitleOnCommand=visible,false -CDTitleOffCommand=bouncebegin,0.05;zoomx,0; [ScreenSelectCourse] # Since ScreenSelectCourse falls back on ScreenSelectMusic, it can just get the metrics it needs @@ -746,7 +738,7 @@ NumShownItems=3 # TODO: Make this use DifficultyList? CapitalizeDifficultyNames=false NumShownItems=6 -ItemsSpacingY=37 +ItemsSpacingY=38 MoveCommand=decelerate,0.05 FrameX= @@ -764,10 +756,11 @@ MaxTicks=10 # ShowMeter=true MeterX=84+24 -MeterOnCommand=zoom,0.6;maxwidth,47 +MeterOnCommand=zoom,0.6;maxwidth,47;shadowlength,1; MeterSetCommand=%function(self,param) \ if param.CustomDifficulty and param.CustomDifficulty ~= "" then \ - self:diffuse(ColorDarkTone( CustomDifficultyToColor(param.CustomDifficulty) )); \ + self:diffuse(color("#000000")); \ + self:diffusealpha(0.75); \ end; \ if param.Meter then \ if param.Meter >= 13 then \ @@ -786,7 +779,8 @@ DescriptionSetCommand=%function(self,param) \ self:settext("Edit"); \ end; \ if param.CustomDifficulty and param.CustomDifficulty ~= "" then \ - self:diffuse(ColorDarkTone(CustomDifficultyToColor(param.CustomDifficulty))); \ + self:diffuse(color("#000000")); \ + self:diffusealpha(0.75); \ end; \ end; # @@ -797,7 +791,7 @@ AutogenOnCommand=diffuseshift;effectcolor1,Color.Alpha( Color("Red") , 0.5 );eff #AutogenOnCommand=zoom,0.75; # ShowStepsType=true -StepsTypeX=-97 +StepsTypeX=-100 StepsTypeY=0 StepsTypeOnCommand= StepsTypeSetCommand=