changes from midi

Fallback: missing music
Default: AutoSetStyle compatibility
This commit is contained in:
AJ Kelly
2010-06-07 22:51:28 -05:00
parent 30010dd916
commit 6cf2eeba47
3 changed files with 12 additions and 12 deletions
@@ -0,0 +1 @@
_Music menu
@@ -4,7 +4,7 @@ return Def.ActorFrame {
OnCommand=cmd(diffuse,Color("Black");diffusealpha,0;linear,0.35;diffusealpha,0.5);
};
Def.Quad {
InitCommand=cmd(y,24*8-10;zoomto,164,2;fadeleft,8/164;faderight,8/164);
InitCommand=cmd(y,24*(GetUserPrefB("UserPrefAutoSetStyle") and 8 or 5)-10;zoomto,164,2;fadeleft,8/164;faderight,8/164);
OnCommand=cmd(diffuse,Color("Black");diffusealpha,0;linear,0.35;diffusealpha,0.5);
};
Def.StepsDisplayList {
+10 -11
View File
@@ -5,7 +5,7 @@ FallbackTheme=_fallback
FirstAttractScreen=""
InitialScreen="ScreenInit"
#AutoSetStyle=GetUserPref("UserPrefAutoSetStyle")
AutoSetStyle=GetUserPrefB("UserPrefAutoSetStyle")
[BitmapText]
NumRainbowColors=1
RainbowColor1=Color("Black");
@@ -426,7 +426,7 @@ end;
#
ShowDescription=true
DescriptionX=-20
DescriptionY=-5
DescriptionY=GetUserPrefB("UserPrefAutoSetStyle") and -5 or 0
DescriptionOnCommand=shadowlength,1;uppercase,true;zoom,0.75;maxwidth,128+8
DescriptionSetCommand=%function(self,param) \
if self:GetText() == "" then \
@@ -444,7 +444,7 @@ AutogenY=0
AutogenOnCommand=
AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.Difficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.Difficulty)); end end
#
ShowStepsType=true
ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle")
StepsTypeX=-20
StepsTypeY=7
StepsTypeOnCommand=zoom,0.45
@@ -474,7 +474,7 @@ Fallback="StepsDisplay"
[StepsDisplayListRow]
#
CapitalizeDifficultyNames=false
NumShownItems=8
NumShownItems=GetUserPrefB("UserPrefAutoSetStyle") and 8 or 5
ItemsSpacingY=24
MoveCommand=decelerate,0.3
#
@@ -516,7 +516,7 @@ MeterSetCommand=%function(self,param) \
end;
#
ShowDescription=true
DescriptionX=-64-8+20
DescriptionX=GetUserPrefB("UserPrefAutoSetStyle") and (-64-8+20) or (-64-8)
DescriptionY=0
DescriptionOnCommand=shadowlength,1;horizalign,left;zoom,0.65;maxwidth,128+8-20;uppercase,true;
DescriptionOffCommand=
@@ -536,8 +536,7 @@ AutogenY=0
AutogenOnCommand=diffuseshift;effectcolor1,Colors.Alpha( Color("Green") , 0.5 );effectcolor2,ColorLightTone( Color("Green") );
AutogenSetCommand=
#
#ShowStepsType=GetUserPref("UserPrefAutoSetStyle")
ShowStepsType=true
ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle")
StepsTypeX=-64-8
StepsTypeY=0
StepsTypeOnCommand=
@@ -633,7 +632,7 @@ ItemsLongRowSharedX=SCREEN_CENTER_X
[ScreenOptionsTheme]
Fallback="ScreenOptionsServiceChild"
LineNames="gNotePos,gScore,gSDisp,gOpts,gLongFail,"
LineNames="gNotePos,gAuto,gScore,gSDisp,gOpts,gLongFail,"
#,gAuto
LinegNotePos="lua,UserPrefNotePosition()"
LinegScore="lua,UserPrefGameplayShowScore()"
@@ -886,7 +885,7 @@ MusicWheelOffCommand=bouncebegin,0.15;zoomx,0;
ShowNewSong=not GAMESTATE:IsCourseMode()
NewSongX=SCREEN_CENTER_X-160+128
NewSongY=SCREEN_TOP+160
NewSongOnCommand=diffuse,Color("Orange");diffusetopedge,Color("Yellow");strokecolor,Color("Outline");zoom,0.75;skewx,-0.125;rotationz,-11.25/2;draworder,106;
NewSongOnCommand=finishtweening;diffuse,Color("Orange");diffusetopedge,Color("Yellow");strokecolor,Color("Outline");zoom,0.75;skewx,-0.125;rotationz,-11.25/2;draworder,106;playcommand,"Set"
NewSongOffCommand=accelerate,0.35*0.5;zoom,0.5;diffusealpha,0
NewSongShowCommand=finishtweening;decelerate,0.125;diffusealpha,1;zoomy,0.75;thump,2;effectclock,'bgm';effectmagnitude,1,1,1;effectcolor1,color("1,1,1");effectcolor2,color("1,1.25,1");
NewSongHideCommand=finishtweening;accelerate,0.075;diffusealpha,0;zoomy,0.75*1.5;stopeffect;
@@ -918,9 +917,9 @@ SortOrderFrameSongChosenCommand=linear,0.25;diffusealpha,0;
SortOrderFrameOffCommand=bouncebegin,0.15;zoomy,0;
#
ShowStageDisplay=true
StageDisplayX=SCREEN_CENTER_X-160
StageDisplayX=SCREEN_CENTER_X-160-64
StageDisplayY=SCREEN_TOP+160-96+4
StageDisplayOnCommand=draworder,105;fov,90;zoom,0.75;vanishpoint,SCREEN_CENTER_X-160,SCREEN_TOP+160-96+4;rotationy,90;decelerate,0.5;rotationy,0;
StageDisplayOnCommand=draworder,105;fov,90;zoom,0.75;zoomy,0;sleep,0.35;smooth,0.35;zoomy,0.75
StageDisplayOffCommand=linear,0.25;diffusealpha,0;
#
BannerX=SCREEN_CENTER_X-160