various theme changes, mostly from midi

removes duplicate round() function in productivityhelpers
This commit is contained in:
AJ Kelly
2010-08-14 19:22:44 -05:00
parent 5175499e08
commit ccd2b4ae6d
6 changed files with 54 additions and 52 deletions
@@ -157,6 +157,13 @@ end
t[#t+1] = StandardDecorationFromFileOptional("LifeDifficulty","LifeDifficulty");
t[#t+1] = StandardDecorationFromFileOptional("TimingDifficulty","TimingDifficulty");
t[#t+1] = StandardDecorationFromFileOptional("GameType","GameType");
t[#t+1] = LoadActor( THEME:GetPathG("ScreenStageInformation","Stage extra1" ) ) .. {
InitCommand=cmd(Center;draworder,105);
OnCommand=cmd(visible,GAMESTATE:IsExtraStage() and not GAMESTATE:IsExtraStage2();linear,2;zoom,0;diffusealpha,1;);
};
t[#t+1] = LoadActor( THEME:GetPathG("ScreenStageInformation","Stage extra2" ) ) .. {
InitCommand=cmd(Center;draworder,105);
OnCommand=cmd(visible,not GAMESTATE:IsExtraStage() and GAMESTATE:IsExtraStage2();linear,2;zoom,0;diffusealpha,1;);
};
return t
@@ -83,16 +83,23 @@ t[#t+1] = Def.ActorFrame {
end
end
-- we're safe, you can push the values
tTotalJudgments[#tTotalJudgments+1] = math.abs( param.TapNoteOffset );
local iTapNoteOffset = param.TapNoteOffset;
local fTapNoteOffset = param.TapNoteOffset;
if param.HoldNoteScore then
iTapNoteOffset = 1;
fTapNoteOffset = 1;
else
iTapNoteOffset = param.TapNoteOFfset;
fTapNoteOffset = param.TapNoteOffset;
end
if param.TapNoteScore == 'TapNoteScore_Miss' then
fTapNoteOffset = 1;
else
fTapNoteOffset = fTapNoteOffset;
end;
-- we're safe, you can push the values
tTotalJudgments[#tTotalJudgments+1] = math.abs( fTapNoteOffset );
self:playcommand("Reset");
c.Judgment:visible( not bShowProtiming );
@@ -100,11 +107,11 @@ t[#t+1] = Def.ActorFrame {
JudgeCmds[param.TapNoteScore](c.Judgment);
c.ProtimingDisplay:visible( bShowProtiming );
c.ProtimingDisplay:settextf("%i%%",100 - math.floor(math.abs(param.TapNoteOffset * 1000)) );
c.ProtimingDisplay:settextf("%i%%",clamp(100 - math.floor(math.abs(fTapNoteOffset * 1000)) ,0,100));
ProtimingCmds[param.TapNoteScore](c.ProtimingDisplay);
c.ProtimingAverage:visible( bShowProtiming );
c.ProtimingAverage:settextf("%.2f%%",100 - MakeAverage( tTotalJudgments ) * 1000 );
c.ProtimingAverage:settextf("%.2f%%",clamp(100 - MakeAverage( tTotalJudgments ) * 1000 ,0,100));
AverageCmds['Pulse'](c.ProtimingAverage);
end;
};
@@ -3,9 +3,11 @@ return Def.ActorFrame {
local song = GAMESTATE:GetCurrentSong();
if song then
-- self:setaux(0);
self:finishtweening();
self:playcommand("TweenOn");
elseif not song then
elseif not song and self:GetZoomX() == 1 then
-- self:setaux(1);
self:finishtweening();
self:playcommand("TweenOff");
end;
end;