fix bug related to percent on selmusic when no song is displayed.

metrics edits (trying to get the percent score to not suck on eval; not really working out so well)
Midi updated themeinfo and productivtyhelpers recently, too
This commit is contained in:
AJ Kelly
2010-09-07 11:15:26 -05:00
parent 2dc57e92a3
commit c48214a352
4 changed files with 33 additions and 20 deletions
@@ -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 ]]
@@ -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");
+5 -5
View File
@@ -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,
};
+4 -1
View File
@@ -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=