default theme changes from midiman

This commit is contained in:
AJ Kelly
2010-09-04 11:32:26 -05:00
parent b197b4a97d
commit 2dc57e92a3
9 changed files with 143 additions and 36 deletions
@@ -70,23 +70,41 @@ t[#t+1] = Def.ActorFrame {
ResetCommand=cmd(finishtweening;diffusealpha,0.8;visible,false);
OnCommand=cmd(diffuse,Color("Black");diffusetopedge,color("0.1,0.1,0.1,1");diffusealpha,0.8;shadowlength,2;);
};
Def.Quad {
Name="ProtimingGraphWindowW3";
InitCommand=cmd(visible,false;y,32;zoomto,192-4,16-4);
ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false);
OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W3"];);
};
Def.Quad {
Name="ProtimingGraphWindowW2";
InitCommand=cmd(visible,false;y,32;zoomto,scale(PREFSMAN:GetPreference("TimingWindowSecondsW2"),0,PREFSMAN:GetPreference("TimingWindowSecondsW3"),0,192-4),16-4);
ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false);
OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W2"];);
};
Def.Quad {
Name="ProtimingGraphWindowW1";
InitCommand=cmd(visible,false;y,32;zoomto,scale(PREFSMAN:GetPreference("TimingWindowSecondsW1"),0,PREFSMAN:GetPreference("TimingWindowSecondsW3"),0,192-4),16-4);
ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false);
OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W1"];);
};
Def.Quad {
Name="ProtimingGraphUnderlay";
InitCommand=cmd(visible,false;y,32;zoomto,192-4,16-4);
ResetCommand=cmd(finishtweening;diffusealpha,0.5;visible,false);
OnCommand=cmd(diffuse,Color("Orange");diffusealpha,0.5);
ResetCommand=cmd(finishtweening;diffusealpha,0.25;visible,false);
OnCommand=cmd(diffuse,Color("Black");diffusealpha,0.25);
};
Def.Quad {
Name="ProtimingGraphFill";
InitCommand=cmd(visible,false;y,32;zoomto,0,16-4;horizalign,left;);
ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false);
OnCommand=cmd(diffuse,Color("Orange");diffuserightedge,Color("Yellow"););
OnCommand=cmd(diffuse,Color("Red"););
};
Def.Quad {
Name="ProtimingGraphAverage";
InitCommand=cmd(visible,false;y,32;zoomto,2,7;);
ResetCommand=cmd(finishtweening;diffusealpha,0.5;visible,false);
OnCommand=cmd(diffuse,Color("Green");diffusealpha,0.5;glowshift);
OnCommand=cmd(diffuse,Color("Blue");diffusealpha,0.5;glowshift);
};
Def.Quad {
Name="ProtimingGraphCenter";
@@ -148,15 +166,35 @@ t[#t+1] = Def.ActorFrame {
c.ProtimingGraphBG:visible( bShowProtiming );
c.ProtimingGraphUnderlay:visible( bShowProtiming );
c.ProtimingGraphWindowW3:visible( bShowProtiming );
c.ProtimingGraphWindowW2:visible( bShowProtiming );
c.ProtimingGraphWindowW1:visible( bShowProtiming );
c.ProtimingGraphFill:visible( bShowProtiming );
c.ProtimingGraphFill:finishtweening();
c.ProtimingGraphFill:decelerate(0.025);
c.ProtimingGraphFill:zoomtowidth( clamp(fTapNoteOffset * 188,-188/2,188/2) );
c.ProtimingGraphFill:decelerate(1/60);
-- c.ProtimingGraphFill:zoomtowidth( clamp(fTapNoteOffset * 188,-188/2,188/2) );
c.ProtimingGraphFill:zoomtowidth( clamp(
scale(
fTapNoteOffset,
0,PREFSMAN:GetPreference("TimingWindowSecondsW3"),
0,188/2),
-188/2,188/2)
);
c.ProtimingGraphAverage:visible( bShowProtiming );
c.ProtimingGraphAverage:zoomtowidth( clamp(MakeAverage( tTotalJudgments ) * 1880,0,188) );
c.ProtimingGraphAverage:zoomtowidth( clamp(
scale(
MakeAverage( tTotalJudgments ),
0,PREFSMAN:GetPreference("TimingWindowSecondsW3"),
0,188),
0,188)
);
-- c.ProtimingGraphAverage:zoomtowidth( clamp(MakeAverage( tTotalJudgments ) * 1880,0,188) );
c.ProtimingGraphCenter:visible( bShowProtiming );
(cmd(sleep,2;linear,0.5;diffusealpha,0))(c.ProtimingGraphBG);
(cmd(sleep,2;linear,0.5;diffusealpha,0))(c.ProtimingGraphUnderlay);
(cmd(sleep,2;linear,0.5;diffusealpha,0))(c.ProtimingGraphWindowW3);
(cmd(sleep,2;linear,0.5;diffusealpha,0))(c.ProtimingGraphWindowW2);
(cmd(sleep,2;linear,0.5;diffusealpha,0))(c.ProtimingGraphWindowW1);
(cmd(sleep,2;linear,0.5;diffusealpha,0))(c.ProtimingGraphFill);
(cmd(sleep,2;linear,0.5;diffusealpha,0))(c.ProtimingGraphAverage);
(cmd(sleep,2;linear,0.5;diffusealpha,0))(c.ProtimingGraphCenter);
@@ -1,2 +1,8 @@
return LoadFont("Common Normal") .. {
return Def.ActorFrame {
LoadActor(THEME:GetPathG("OptionRowExit","frame")) .. {
InitCommand=cmd(diffusebottomedge,Color("Orange"));
};
LoadActor(THEME:GetPathG("_icon","Sort")) .. {
InitCommand=cmd(x,-60;shadowlength,1;diffuse,Color("Orange");diffusetopedge,Color("Yellow"));
};
};
@@ -10,10 +10,14 @@ return Def.ActorFrame {
end;
end;
}; --]]
-- LoadActor(THEME:GetPathG("OptionRowExit","frame"));
LoadActor(THEME:GetPathG("_icon","Health")) .. {
InitCommand=cmd(x,-60;shadowlength,1);
};
LoadFont("Common Normal") .. {
Text=GetLifeDifficulty();
AltText="";
InitCommand=cmd(x,-72;horizalign,left;zoom,0.5);
InitCommand=cmd(x,-72+28;horizalign,left;zoom,0.5);
OnCommand=cmd(shadowlength,1);
BeginCommand=function(self)
self:settextf( Screen.String("LifeDifficulty"), "" );
@@ -22,7 +26,7 @@ return Def.ActorFrame {
LoadFont("Common Normal") .. {
Text=GetLifeDifficulty();
AltText="";
InitCommand=cmd(x,72*0.75;zoom,0.875);
InitCommand=cmd(x,72*0.75+8;zoom,0.875);
OnCommand=cmd(shadowlength,1;skewx,-0.125);
};
};
@@ -12,10 +12,14 @@ return Def.ActorFrame {
end;
end;
}; --]]
-- LoadActor(THEME:GetPathG("OptionRowExit","frame"));
LoadActor(THEME:GetPathG("_icon","Timing")) .. {
InitCommand=cmd(x,-60;shadowlength,1);
};
LoadFont("Common Normal") .. {
Text=GetTimingDifficulty();
AltText="";
InitCommand=cmd(x,-72;horizalign,left;zoom,0.5);
InitCommand=cmd(x,-72+28;horizalign,left;zoom,0.5);
OnCommand=cmd(shadowlength,1);
BeginCommand=function(self)
self:settextf( Screen.String("TimingDifficulty"), "" );
@@ -24,7 +28,7 @@ return Def.ActorFrame {
LoadFont("Common Normal") .. {
Text=GetTimingDifficulty();
AltText="";
InitCommand=cmd(x,72*0.75;zoom,0.875);
InitCommand=cmd(x,72*0.75+8;zoom,0.875);
OnCommand=function(self)
(cmd(shadowlength,1;skewx,-0.125))(self);
if GetTimingDifficulty() == 9 then
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

+79 -24
View File
@@ -374,7 +374,37 @@ DeltaSecondsGainLifeCommand=
[ScoreDisplayPercentage Percent]
PercentP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);diffusetopedge,BoostColor(PlayerColor(PLAYER_1),1.5)
PercentP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5)
[ScreenEvaluation Percent]
# This shouldn't even be named this but whatever man.
PercentP1X=0
PercentP1Y=0
PercentP1OnCommand=horizalign,right;shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );
PercentP1OffCommand=
PercentP2X=0
PercentP2Y=0
PercentP2OnCommand=horizalign,right;shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );
PercentP2OffCommand=
PercentRemainderP1X=0
PercentRemainderP1Y=0
PercentRemainderP1OnCommand=horizalign,left;shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );
PercentRemainderP1OffCommand=
PercentRemainderP2X=0
PercentRemainderP2Y=0
PercentRemainderP2OnCommand=horizalign,left;shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );
PercentRemainderP2OffCommand=
DancePointsP1X=0
DancePointsP1Y=0
DancePointsP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );
DancePointsP1OffCommand=
DancePointsP2X=0
DancePointsP2Y=0
DancePointsP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );
DancePointsP2OffCommand=
DancePointsDigits=2
PercentUseRemainder=true
ApplyScoreDisplayOptions=true
FormatPercentScore=FormatPercentScore
Format=
[ScoreDisplayRave]
MeterP1X=
MeterP1Y=
@@ -654,16 +684,20 @@ StepsTypeSetCommand=
[StreamDisplay]
; a simple bar life meter:
; PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) local native_width=32; local zoomed_width=12; self:zoomx(zoomed_width/native_width); self:x((itemIndex-(numItems/2))*zoomed_width); end
# PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
# local fItemWidth = ( 256 / numItems ) \
# self:x( ((itemIndex-(numItems/2))*fItemWidth) + ( numItems / 2 ) ); \
# self:zoomtowidth(fItemWidth); \
# self:diffuseramp(); \
# self:effectperiod(4); \
# self:effectoffset((itemIndex-1)/numItems * -1); \
# self:effectcolor2(color("1,1,1,1")); \
# self:effectcolor1(color("0.5,0.5,0.5,1")); \
# self:effectclock('beatnooffset'); \
# end;
PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
local fItemWidth = ( 256 / numItems ) \
self:x( ((itemIndex-(numItems/2))*fItemWidth) + ( numItems / 2 ) ); \
self:zoomtowidth(fItemWidth); \
self:diffuseramp(); \
self:effectperiod(4); \
self:effectoffset((itemIndex-1)/numItems * -1); \
self:effectcolor2(color("1,1,1,1")); \
self:effectcolor1(color("0.5,0.5,0.5,1")); \
self:effectclock('beatnooffset'); \
end;
# PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
# local fItemWidth = ( 256 / numItems ) \
@@ -673,8 +707,8 @@ end;
# self:effecttiming(1,0.01875*itemIndex,1,1-(0.01875*itemIndex)); \
# self:effectclock('beatnooffset'); \
# end;
TextureCoordScaleX=2*16
NumPills=16
TextureCoordScaleX=1
NumPills=1
AlwaysBounceNormalBar=false
[TextBanner]
@@ -854,7 +888,7 @@ CurrentGametypeOffCommand=linear,0.5;cropleft,1
#
ShowTimingDifficulty=true
TimingDifficultyX=SCREEN_LEFT+84
TimingDifficultyY=SCREEN_TOP+24
TimingDifficultyY=SCREEN_TOP+22
TimingDifficultyOnCommand=
TimingDifficultyOffCommand=
#
@@ -1103,22 +1137,22 @@ SongTimeAutogenCommand=diffuse,Color("Green");
SongTimeLongCommand=diffuse,Color("Yellow");diffusebottomedge,Color("Orange");
SongTimeMarathonCommand=diffuse,Color("Orange");diffusebottomedge,Color("Red");
#
ShowSortOrder=true
SortOrderX=SCREEN_CENTER_X+128+32
SortOrderY=SCREEN_TOP+24+4
SortOrderOnCommand=draworder,105;strokecolor,Color("Outline");zoom,0.75
SortOrderSortCommand=finishtweening;zoom,0.75*1.25;diffuse,Color("Yellow");diffusebottomedge,Color("Orange");decelerate,0.5;zoom,0.75;diffuse,Color("White");
SortOrderSongChosenCommand=linear,0.25;diffusealpha,0;
SortOrderOffCommand=bouncebegin,0.15;zoomy,0;
#
ShowSortOrderFrame=true
SortOrderFrameX=SCREEN_CENTER_X+128+32
SortOrderFrameY=SCREEN_TOP+24-12
SortOrderFrameOnCommand=draworder,105;shadowlength,1;zoom,0.625;settext,"Sort:"
SortOrderFrameY=SCREEN_TOP+24
SortOrderFrameOnCommand=draworder,105;shadowlength,1
SortOrderFrameSortCommand=
SortOrderFrameSongChosenCommand=linear,0.25;diffusealpha,0;
SortOrderFrameOffCommand=bouncebegin,0.15;zoomy,0;
#
ShowSortOrder=true
SortOrderX=SCREEN_CENTER_X+128+32-48+4
SortOrderY=SCREEN_TOP+24
SortOrderOnCommand=draworder,105;horizalign,left;strokecolor,Color("Outline");zoom,0.675;maxwidth,114/0.675;
SortOrderSortCommand=finishtweening;zoom,0.675*1.25;diffuse,Color("Yellow");diffusebottomedge,Color("Orange");decelerate,0.5;zoom,0.675;diffuse,Color("White");
SortOrderSongChosenCommand=linear,0.25;diffusealpha,0;
SortOrderOffCommand=bouncebegin,0.15;zoomy,0;
#
ShowStageDisplay=true
StageDisplayX=SCREEN_CENTER_X-160-64
StageDisplayY=SCREEN_TOP+160-96+4
@@ -1525,10 +1559,12 @@ ShowJudgmentLineMiss=true
ShowJudgmentLineMaxCombo=true
ShowGradeArea=true
ShowScoreArea=true
ShowPointsArea=true
ShowSharedJudgmentLineLabels=true
ShowGraphDisplay=true
ShowComboGraph=true
ShowStepsDisplay=true
#
W1NumberP1X=SCREEN_CENTER_X-160+40
W1NumberP1Y=SCREEN_TOP+160
@@ -1620,7 +1656,6 @@ HeldLabelX=SCREEN_CENTER_X
HeldLabelY=SCREEN_TOP+280
HeldLabelOnCommand=
HeldLabelOffCommand=
#
MaxComboNumberP1X=SCREEN_CENTER_X-160+40
MaxComboNumberP1Y=SCREEN_TOP+300
@@ -1642,13 +1677,33 @@ ScoreLabelOffCommand=
#
ScoreNumberP1X=SCREEN_CENTER_X-160
ScoreNumberP1Y=SCREEN_TOP+320
ScoreNumberP1OnCommand=diffuse,PlayerColor(PLAYER_1);diffusetopedge,BoostColor(PlayerColor(PLAYER_1),1.5);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );shadowlength,1;zoom,0.775
ScoreNumberP1OnCommand=visible,not PREFSMAN:GetPreference("PercentageScoring");diffuse,PlayerColor(PLAYER_1);diffusetopedge,BoostColor(PlayerColor(PLAYER_1),1.5);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );shadowlength,1;zoom,0.775
ScoreNumberP1OffCommand=
ScoreNumberP2X=SCREEN_CENTER_X+160
ScoreNumberP2Y=SCREEN_TOP+320
ScoreNumberP2OnCommand=diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );shadowlength,1;zoom,0.775
ScoreNumberP2OnCommand=visible,not PREFSMAN:GetPreference("PercentageScoring");diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );shadowlength,1;zoom,0.775
ScoreNumberP2OffCommand=
#
PercentFrameP1X=SCREEN_CENTER_X-160
PercentFrameP1Y=SCREEN_TOP+320
PercentFrameP1OnCommand=visible,false
PercentFrameP1OffCommand=
#
PercentFrameP2X=SCREEN_CENTER_X+160
PercentFrameP2Y=SCREEN_TOP+320
PercentFrameP2OnCommand=visible,false
PercentFrameP2OffCommand=
#
PercentP1X=SCREEN_CENTER_X-160
PercentP1Y=SCREEN_TOP+320
PercentP1OnCommand=visible,PREFSMAN:GetPreference("PercentageScoring");
PercentP1OffCommand=
#
PercentP2X=SCREEN_CENTER_X-160
PercentP2Y=SCREEN_TOP+320
PercentP2OnCommand=visible,PREFSMAN:GetPreference("PercentageScoring");
PercentP2OffCommand=
#
LargeBannerX=SCREEN_CENTER_X
LargeBannerY=SCREEN_TOP+100
LargeBannerOnCommand=
Binary file not shown.