A few minute adjustments to metrics, add cdtitle

ListenerJubatus · Feb 9, 2018 · 8974782 · 8974782
1 parent 8366cab
commit 8974782
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 14 deletions.
diff --git a/BGAnimations/ScreenSelectMusic decorations/default.lua b/BGAnimations/ScreenSelectMusic decorations/default.lua
@@ -194,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
@@ -303,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
@@ -417,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/BGAnimations/ScreenSelectMusic overlay.lua b/BGAnimations/ScreenSelectMusic overlay.lua
@@ -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
diff --git a/metrics.ini b/metrics.ini
@@ -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=