Skip to content

Commit

Permalink
various fixes, graphics
Browse files Browse the repository at this point in the history
  • Loading branch information
ListenerJubatus committed Sep 17, 2017
1 parent 5a589e0 commit d58f8e0
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 21 deletions.
7 changes: 7 additions & 0 deletions BGAnimations/ScreenMiniMenu underlay/default.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
return Def.ActorFrame {
OnCommand= function(self) self:queuecommand("Recenter") end,
RecenterCommand= function(self) SCREENMAN:GetTopScreen():xy(0, 0) end,
Def.Quad{
InitCommand=cmd(scaletocover,-SCREEN_WIDTH*2,SCREEN_TOP,SCREEN_WIDTH*2,SCREEN_BOTTOM;diffuse,color("0,0,0,0.5"));
};
};
4 changes: 2 additions & 2 deletions BGAnimations/ScreenSelectMusic decorations/default.lua
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ t[#t+1] = Def.ActorFrame {
end
};
LoadFont("Common Normal") .. {
InitCommand=cmd(uppercase,true;zoom,0.75;addy,-20;addx,-143;diffuse,color("#000000"););
InitCommand=cmd(uppercase,true;zoom,0.75;addy,-20;addx,-143;diffuse,color("#000000");maxwidth,130);
OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;);
OffCommand=cmd(linear,0.3;diffusealpha,0;);
CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set";);
Expand Down Expand Up @@ -382,7 +382,7 @@ t[#t+1] = Def.ActorFrame {
end
};
LoadFont("Common Normal") .. {
InitCommand=cmd(uppercase,true;zoom,0.75;addy,-20;addx,143;diffuse,color("#000000"););
InitCommand=cmd(uppercase,true;zoom,0.75;addy,-20;addx,143;diffuse,color("#000000");maxwidth,130);
OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;);
OffCommand=cmd(linear,0.3;diffusealpha,0;);
CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set";);
Expand Down
15 changes: 7 additions & 8 deletions BGAnimations/ScreenSelectProfile overlay.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ function GetLocalProfiles()
InitCommand=cmd(zoomto,200,1;y,40/2);
OnCommand=cmd(diffuse,Color('Outline'););
}; --]]
LoadFont("Common Normal") .. {
LoadFont("Common Condensed") .. {
Text=profile:GetDisplayName();
InitCommand=cmd(shadowlength,1;y,-10;zoom,1;ztest,true);
};
LoadFont("Common Normal") .. {
LoadFont("Common Fallback") .. {
InitCommand=cmd(shadowlength,1;y,8;zoom,0.5;vertspacing,-8;ztest,true);
BeginCommand=function(self)
local numSongsPlayed = profile:GetNumTotalSongsPlayed();
Expand All @@ -33,7 +33,7 @@ end;
function LoadCard(cColor)
local t = Def.ActorFrame {
Def.Quad {
InitCommand=cmd(zoomto,300,SCREEN_HEIGHT/1.3;diffuse,ColorDarkTone(cColor);diffusealpha,0.6;fadetop,0.3;fadebottom,0.3)
InitCommand=cmd(zoomto,300,SCREEN_HEIGHT/1.3;y,20;diffuse,ColorDarkTone(cColor);diffusealpha,0.8;fadetop,0.2;fadebottom,0.2)
}
}
return t
Expand All @@ -57,9 +57,9 @@ function LoadPlayerStuff(Player)
InitCommand=cmd(zoomto,200,230);
OnCommand=cmd(diffuse,Color('Orange');diffusealpha,0.5);
}; --]]
LoadFont("Common Normal") .. {
LoadFont("Common Italic Condensed") .. {
Text="Press &START; to join.";
InitCommand=cmd(shadowlength,1);
InitCommand=cmd(shadowlength,1;zoom,1.25);
OnCommand=cmd(diffuseshift;effectcolor1,Color('White');effectcolor2,color("0.5,0.5,0.5"));
};
};
Expand Down Expand Up @@ -97,10 +97,9 @@ function LoadPlayerStuff(Player)
t[#t+1] = Def.ActorFrame {
Name = "EffectFrame";
};
t[#t+1] = LoadFont("Common Normal") .. {
t[#t+1] = LoadFont("Common Condensed") .. {
Name = 'SelectedProfileText';
--InitCommand=cmd(y,160;shadowlength,1;diffuse,PlayerColor(Player));
InitCommand=cmd(y,160;shadowlength,1;);
InitCommand=cmd(y,160;shadowlength,1;diffuse,ColorLightTone(PlayerColor(Player));diffusebottomedge,color("#FFFFFF");zoom,1.25);
};

return t;
Expand Down
Binary file added Graphics/Banner all music.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Graphics/Banner mode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Graphics/Banner preferred.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 10 additions & 11 deletions metrics.ini
Original file line number Diff line number Diff line change
Expand Up @@ -509,17 +509,16 @@ LineCC="lua,ThemePrefRow('CustomComboContinue')"
LineCM="lua,ThemePrefRow('CustomComboMaintain')"

[ScreenMiniMenuContext]
PageOnCommand=visible,false
LineHighlightX=SCREEN_CENTER_X/2

TitleX=SCREEN_CENTER_X
TitleOnCommand=shadowlength,1;
ItemsStartX=SCREEN_CENTER_X
ItemsEndX=SCREEN_CENTER_X
ItemsGapX=14
ItemsLongRowP1X=SCREEN_CENTER_X
ItemsLongRowP2X=SCREEN_CENTER_X
ItemsLongRowSharedX=SCREEN_CENTER_X
PageOnCommand=visible,true
NumRowsShown=12
RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-217+43*offsetFromCenter) end
ItemsStartX=SCREEN_CENTER_X+120
ItemsEndX=SCREEN_CENTER_X+280
LineHighlightX=SCREEN_CENTER_X

[OptionRowMiniMenuContext]
Fallback="OptionRowMiniMenu"
TitleX=240

[ScreenSelectStyle]
UpdateOnMesage=""
Expand Down

0 comments on commit d58f8e0

Please sign in to comment.