diff --git a/Themes/_fallback/Scripts/03 ProductivityHelpers.lua b/Themes/_fallback/Scripts/03 ProductivityHelpers.lua index 0afbb03112..1f168df8e5 100644 --- a/Themes/_fallback/Scripts/03 ProductivityHelpers.lua +++ b/Themes/_fallback/Scripts/03 ProductivityHelpers.lua @@ -24,11 +24,22 @@ function IsFreePlay() end function Center1Player() - return PREFSMAN:GetPreference("Center1Player") and + if GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_OnePlayerTwoSides" then + return true + elseif PREFSMAN:GetPreference("Center1Player") then + if GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_OnePlayerOneSide" then + return true + else + return false + end + else + return false + end +--[[ return PREFSMAN:GetPreference("Center1Player") and THEME:GetMetric("ScreenGameplay","AllowCenter1Player") and not GAMESTATE:GetPlayMode("PlayMode_Battle") and not GAMESTATE:GetPlayMode("PlayMode_Rave") and - GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_OnePlayerOneSide"; + GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_OnePlayerOneSide"; --]] end --[[ 3.9 Conditionals ]] diff --git a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index 7700c7160e..d24bea4de3 100644 --- a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -72,7 +72,8 @@ local function PercentScore(pn) end; self:settext(text); end; - CurrentSongChangesMessageCommand=cmd(playcommand,"Set"); + CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); + CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); }; if pn == PLAYER_1 then @@ -208,17 +209,6 @@ if GAMESTATE:IsCourseMode() then end t[#t+1] = StandardDecorationFromFileOptional("DifficultyDisplay","DifficultyDisplay"); - -t[#t+1] = StandardDecorationFromFileOptional("SortOrder","SortOrderText") .. { - BeginCommand=cmd(playcommand,"Set"); - SortOrderChangedMessageCommand=cmd(playcommand,"Set";); - SetCommand=function(self) - local s = SortOrderToLocalizedString( GAMESTATE:GetSortOrder() ); - self:settext( s ); - self:playcommand("Sort"); - end; -}; - t[#t+1] = StandardDecorationFromFileOptional("SortOrderFrame","SortOrderFrame") .. { --[[ BeginCommand=cmd(playcommand,"Set"); SortOrderChangedMessageCommand=cmd(playcommand,"Set";); @@ -228,6 +218,15 @@ t[#t+1] = StandardDecorationFromFileOptional("SortOrderFrame","SortOrderFrame") self:playcommand("Sort"); end; --]] }; +t[#t+1] = StandardDecorationFromFileOptional("SortOrder","SortOrderText") .. { + BeginCommand=cmd(playcommand,"Set"); + SortOrderChangedMessageCommand=cmd(playcommand,"Set";); + SetCommand=function(self) + local s = SortOrderToLocalizedString( GAMESTATE:GetSortOrder() ); + self:settext( s ); + self:playcommand("Sort"); + end; +}; t[#t+1] = StandardDecorationFromFileOptional("SongOptionsFrame","SongOptionsFrame") .. { ShowPressStartForOptionsCommand=THEME:GetMetric(Var "LoadingScreen","SongOptionsFrameShowCommand"); ShowEnteringOptionsCommand=THEME:GetMetric(Var "LoadingScreen","SongOptionsFrameEnterCommand"); diff --git a/Themes/default/Scripts/00 ThemeInfo.lua b/Themes/default/Scripts/00 ThemeInfo.lua index 5521820afe..3fb9b937fa 100644 --- a/Themes/default/Scripts/00 ThemeInfo.lua +++ b/Themes/default/Scripts/00 ThemeInfo.lua @@ -1,9 +1,9 @@ -- theme identification: themeInfo = { ProductCode = "SSC-00X", - Name = "Urban Fragments", - Version = 0.70, - Date = "20100706", - Internal = "dev 00000000-0000", - Revision = 3002, + Name = "Move Me", + Version = 1.00, + Date = "20100906", + Internal = "rel 00000000-3500", + Revision = 3500, }; \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 5a52534286..6fd73f81c1 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -405,6 +405,9 @@ PercentUseRemainder=true ApplyScoreDisplayOptions=true FormatPercentScore=FormatPercentScore Format= +PercentDecimalPlaces=2 +PercentTotalSize=5 + [ScoreDisplayRave] MeterP1X= MeterP1Y= @@ -1236,7 +1239,7 @@ 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;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75;spin;effectmagnitude,0,180,0;fov,90 +CDTitleOnCommand=draworder,106;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75;spin;effectmagnitude,0,180,0; CDTitleOffCommand=bouncebegin,0.15;zoomx,0; # ScoreFrameP1X=