diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index ea124393db..91f95a189b 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -4,6 +4,9 @@ FallbackTheme=_fallback [Common] FirstAttractScreen="" +InitialScreen="ScreenInit" + +# AutoSetStyle=GetUserPrefB("UserPrefAutoSetStyle") # 02 # [LightsManager] @@ -23,6 +26,8 @@ SongGroupColor9=BoostColor(Color("Orange"),1.25) SongGroupColor10=BoostColor(Color("Orange"),1.25) CourseGroupColor1=color("1,1,1,1") +UnlockColor=color("1,0.5,0,1") +ExtraColor=color("#ff0000") -- red [UnlockManager] @@ -43,14 +48,33 @@ SetNormalCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("White");dif SetChangeCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5); SetRandomCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Blue");diffusetopedge,BoostColor(Color("Blue"),1.5); SetExtraCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.5); +Cycle=true +NoBpmText="000" RandomCycleSpeed=0.2 -- smaller numbers mean the bpm cycles faster +Separator="-" +ShowQMarksInRandomCycle=true + +[CodeDetector] +# For Future Reference: +# @ = Holding +# - = In Conjuction With / Then +# ~ = Released +# + = At The Same Time + +[CodeDetectorOnline] [CombinedLifeMeterTug] +# We dont use it. MeterWidth=512-8 MeterHeight=40 [Combo] ShowComboAt=2 + +NumberMinZoom=0.8 +NumberMaxZoom=1 +NumberMaxZoomAt=100 +LabelMinZoom=0.75*0.75 LabelMaxZoom=0.75*1 PulseCommand=%function(self,param) self:finishtweening(); self:diffusealpha(1); self:zoom(1.125*param.Zoom); self:linear(0.05); self:zoom(param.Zoom); self:sleep(2); self:linear(0.5); self:diffusealpha(0); end; @@ -59,13 +83,33 @@ NumberOnCommand=y,240-216-1.5;shadowlength,1;horizalign,right;vertalign,bottom;s LabelOnCommand=x,6;y,22.5;shadowlength,1;zoom,0.75;diffusebottomedge,color("0.75,0.75,0.75,1");horizalign,left;vertalign,bottom [HoldJudgment] +# !!! # +# HoldJudgmentLetGoCommand=HoldJudgmentLetGo() +# HoldJudgmentHeldCommand=HoldJudgmentHeld() HoldJudgmentLetGoCommand=finishtweening;shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 HoldJudgmentHeldCommand=finishtweening;shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 +# HoldJudgmentLetGoCommand=GAMESTATE:GetCurrentGame():GetName() == "pump" and "visible,false" or "finishtweening;shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0"; +# HoldJudgmentHeldCommand=GAMESTATE:GetCurrentGame():GetName() == "pump" and "visible,false" or "finishtweening;shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0"; +# HoldJudgmentLetGoCommand=function(self) \ + # if GAMESTATE:GetCurrentGame():GetName() == "pump" then \ + # return (cmd(visible,false))(self); \ + # else return (cmd(finishtweening;shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0))(self); \ + # end; \ +# end; +# HoldJudgmentHeldCommand=function(self) \ + # if GAMESTATE:GetCurrentGame():GetName() == "pump" then \ + # return (cmd(visible,false)); \ + # else return (cmd(finishtweening;shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0))(self); \ + # end; \ +# end; [HelpDisplay] TipShowTime=7 [Judgment] +# New # +JudgmentOnCommand= +# !!! # JudgmentW1Command=finishtweening;shadowlength,0;y,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8 JudgmentW2Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 JudgmentW3Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0; @@ -119,12 +163,15 @@ PointsHoldHeld=0 PointsHoldLetGo=0 [DifficultyList] -ItemsSpacingY=24 +CapitalizeDifficultyNames=false NumShownItems=8 +ItemsSpacingY=24 [FadingBanner] +BannerOnCommand= BannerFadeFromCachedCommand=diffusealpha,1;stoptweening;accelerate,0.05;glow,Colors.Alpha( Color("White"), 0.45 );decelerate,0.175;diffusealpha,0;glow,Color("Invisible"); BannerFadeOffCommand=diffusealpha,1;stoptweening;linear,0.25;diffusealpha,0 +BannerResetFadeCommand=diffusealpha,1 [Gameplay] @@ -132,6 +179,8 @@ BannerFadeOffCommand=diffusealpha,1;stoptweening;linear,0.25;diffusealpha,0 [GrooveRadar] +[GroupList] + [HighScore] [Inventory] @@ -147,17 +196,23 @@ BatteryP1Y=0 BatteryP2X=0 BatteryP2Y=0 # +NumLivesP1X=-92 +NumLivesP1Y=0 +NumLivesP2X=92 +NumLivesP2Y=0 NumLivesP2OnCommand=zoomx,-1 [LifeMeterBattery Percent] # still asking for this even though it's in fallback... -aj Format= # -PercentP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) -# DancePointsP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) - -[LifeMeterTime] +DancePointsP2OffCommand= +# +PercentP2X=0 +PercentP2Y=0 +PercentP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) +PercentP2OffCommand= [LyricDisplay] @@ -169,9 +224,13 @@ TitleGainFocusCommand=stoptweening;zoom,0.6375*1.125;bounceend,0.2;diffuse,Color # TitleGainFocusCommand=stoptweening;zoom,0.6375*1.25;bounceend,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);strokecolor,Color("Black");zoom,0.6375;thump;effectmagnitude,1,1.05,1;effectclock,'beat' TitleLoseFocusCommand=diffuse,Color("White");strokecolor,Color("Black");stopeffect; +[OptionRowService] + [OptionRowExit] +Fallback="OptionRow" FrameOnCommand=visible,true;diffuse,Color("Red"); FrameX=SCREEN_CENTER_X +TitleOnCommand=visible,false ItemsMinBaseZoom=1 ItemOnCommand=shadowlength,1;zoom,0.8;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.75);shadowcolor,BoostColor(Color("Red"),0.35) @@ -208,21 +267,29 @@ RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_1) LeftOnCommand=horizalign,right;diffuse,PlayerColor(PLAYER_2) MiddleOnCommand=;diffuse,PlayerColor(PLAYER_2) RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_2) - [MenuTimer] Text1OnCommand=stopeffect;stoptweening;shadowlength,0;strokecolor,Color("Outline") Text1FormatFunction=function(fSeconds) \ return string.format("%0.1f", fSeconds); \ end +FrameOnCommand= Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1"); +#~ Warning10Command=%function(self) \ + #~ MESSAGEMAN:Broadcast("TimerWarning"); \ + #~ cmd(diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1"))(self); \ +#~ end; [MenuTimerNoSound] -[MusicList] - [MusicWheel] +FadeSeconds=1 SwitchSeconds=0.08 +RandomPicksLockedSongs=true +RouletteSwitchSeconds=0.05 +RouletteSlowDownSwitches=5 LockedInitialVelocity=7 +ScrollBarHeight=300 +ScrollBarOnCommand=visible,false ; linear wheel example: ; ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ ; self:y(offsetFromCenter*38); \ @@ -238,21 +305,29 @@ LockedInitialVelocity=7 ; self:rotationx( rotationx_radians * 180/math.pi ); --[[ to degrees end]] \ ; end; ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:x( (1-math.cos(offsetFromCenter/math.pi))*44 ); self:y( offsetFromCenter*46 ); end +NumWheelItems=11 MusicWheelSortOnCommand=fov,90; MusicWheelSortOffCommand=fov,90; MusicWheelItemSortOnCommand=zoomy,0;bounceend,0.15;zoomy,1 MusicWheelItemSortOffCommand=linear,0.175;zoomy,0 HighlightOnCommand=diffuseshift;effecttiming,(1/8),0,(7/8),0;effectcolor2,Color("White");effectcolor1,color("1,1,1,0.5");effectclock,'beatnooffset' +HighlightOffCommand= HighlightSortOnCommand=stoptweening;decelerate,0.125;glow,Color("Stealth");zoom,1 HighlightSortOffCommand=stoptweening;accelerate,0.125;glow,Color("Orange");zoom,1.05 WheelItemOnDelayOffset=0.04 WheelItemOffDelayOffset=0.04 +WheelItemLockedColor=color("0,0,0,0.5") +# +NumSectionColors=1 SectionColor1=Color("Orange") # SongRealExtraColor=Color("Red") SortMenuColor=Color("Orange") # - +ShowRoulette=true +ShowRandom=false +ShowPortal=false +MostPlayedSongsToShow=30 #~ ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter,ChallengeMeter,Genre,Length" #~ ChoicePreferred="sort,Preferred" #~ ChoiceGroup="sort,Group" @@ -269,6 +344,7 @@ SortMenuColor=Color("Orange") #~ ChoiceLength="sort,Length" #~ ChoiceCourses="sort,AllCourses;" UseEasyMarkerFlag=true +# [CourseWheel] @@ -276,11 +352,15 @@ UseEasyMarkerFlag=true [MusicWheelItem] WheelNotifyIconX=-128-16+0.5 +WheelNotifyIconY=0 WheelNotifyIconOnCommand=shadowlength,2; # SongNameX=-120 +SongNameY=0 +SongNameOnCommand= # CourseX=-120 +CourseY=0 CourseOnCommand=maxwidth,208;horizalign,left # SectionExpandedX=-38 @@ -291,8 +371,11 @@ SectionCollapsedX=-38 SectionCollapsedY=-2 SectionCollapsedOnCommand=maxwidth,194;shadowlength,1;shadowcolor,color("0.1,0.1,0.1,0.2") SectionCountX=112 +SectionCountY=0 SectionCountOnCommand=zoom,0.75;strokecolor,Color("Outline") # +RouletteX=0 +RouletteY=0 RouletteOnCommand=maxwidth,400;shadowlength,1;zoom,0.75;rainbowscroll,true;thump,2; # SortX=-132 @@ -307,12 +390,41 @@ GradeP1X=106+16 GradeP1Y=-8 GradeP2X=110+16 GradeP2Y=8 +GradesShowMachine=true [NoteField] ShowBoard=GAMESTATE:GetCurrentGame():GetName() == "kb7" +[PlayerStageStats] + +[Player] +# ReceptorArrowsYStandard=GetTapPosition('Standard') +# ReceptorArrowsYReverse=GetTapPosition('Reverse') +# RollBodyIncrementsCombo=GetUserPrefB("UserPrefComboOnRolls") + +[PlayerOptions] + +[PlayerShared] + +[Profile] + +[RadarValues] + +[RollingNumbers] + +[RollingNumbersEvaluation] + +[RollingNumbersJudgment] + [ScoreDisplayNormal] +FrameX= +FrameY= +FrameOnCommand= +FrameOffCommand= +TextX= +TextY= TextOnCommand=shadowlength,1;diffusebottomedge,BoostColor(Color('White'),0.75) +TextOffCommand= [ScoreDisplayOni] TextX= @@ -327,12 +439,30 @@ TextOnCommand=shadowlength,1;diffusebottomedge,BoostColor(Color('White'),0.75) TextOffCommand= [ScoreDisplayLifeTime] +FrameX= +FrameY= FrameOnCommand=visible,false;spin +FrameOffCommand= # +TimeRemainingX= TimeRemainingY=80 TimeRemainingOnCommand=zoom,1;shadowlength,1;settext,"Hi!"; +TimeRemainingOffCommand= # DeltaSecondsOnCommand=y,80;settext,Hi;spin; +DeltaSecondsNoneCommand= +DeltaSecondsHitMineCommand= +DeltaSecondsAvoidMineCommand= +DeltaSecondsCheckpointMissCommand= +DeltaSecondsCheckpointHitCommand= +DeltaSecondsMissCommand= +DeltaSecondsW5Command= +DeltaSecondsW4Command= +DeltaSecondsW3Command= +DeltaSecondsW2Command= +DeltaSecondsW1Command= +DeltaSecondsLetGoCommand= +DeltaSecondsHeldCommand= DeltaSecondsGainLifeCommand=zoom,0.5;settext,"Hi!"; [ScoreDisplayPercentage Percent] @@ -340,20 +470,44 @@ PercentP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);diffusetopedge,B PercentP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5) [ScoreDisplayRave] +MeterP1X= +MeterP1Y= MeterP1OnCommand=draworder,-1 +MeterP1OffCommand= +MeterP2X= +MeterP2Y= MeterP2OnCommand=draworder,-1;zoomx,-1 +MeterP2OffCommand= +LevelP1X= +LevelP1Y= LevelP1OnCommand=draworder,105;zoom,0.75;diffuse,ColorLightTone( PlayerColor(PLAYER_1) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );x,-144;skewx,-0.125; +LevelP1OffCommand= +LevelP2X= +LevelP2Y= LevelP2OnCommand=draworder,105;draworder,105;zoom,0.75;diffuse,ColorLightTone( PlayerColor(PLAYER_2) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );x,144;skewx,-0.125; +LevelP2OffCommand= [ScoreKeeperRave] [ScreenEvaluation Percent] -# TODO: Come up with a better name? +# 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) ); @@ -363,7 +517,10 @@ DancePointsP2Y=0 DancePointsP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) ); DancePointsP2OffCommand= DancePointsDigits=2 +PercentUseRemainder=true ApplyScoreDisplayOptions=true +FormatPercentScore=FormatPercentScore +Format= PercentDecimalPlaces=2 PercentTotalSize=5 @@ -376,12 +533,16 @@ PercentTotalSize=5 [SoundEffectControl_Pitch] [StepsDisplayListRow] +# CapitalizeDifficultyNames=false NumShownItems=5 ItemsSpacingY=24 MoveCommand=decelerate,0.3 # FrameX= +FrameY=0 +FrameOnCommand= +FrameOffCommand= FrameSetCommand=%function(self,param) \ if param.CustomDifficulty then \ self:diffuse(ColorMidTone( CustomDifficultyToColor(param.CustomDifficulty) )); \ @@ -390,12 +551,17 @@ FrameSetCommand=%function(self,param) \ end; \ end; # +ShowTicks=false NumTicks=10 MaxTicks=10 +TicksSetCommand= # ShowMeter=true +ZeroMeterString="0" MeterX=56 +MeterY=0 MeterOnCommand=shadowlength,1;zoom,0.65;textglowmode,'TextGlowMode_Inner'; +MeterOffCommand= MeterSetCommand=%function(self,param) \ if param.CustomDifficulty then \ self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ @@ -414,6 +580,7 @@ end; ShowDescription=true DescriptionX=GetGamePrefB("AutoSetStyle") and (-64-8+20) or (-64-8) # 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= DescriptionSetCommand=%function(self,param) \ @@ -431,18 +598,14 @@ AutogenX=0 AutogenY=0 #AutogenOnCommand=diffuseshift;effectcolor1,Colors.Alpha( Color("Green") , 0.5 );effectcolor2,ColorLightTone( Color("Green") ); AutogenOnCommand=blend,Blend.Add;diffuseshift;effectcolor1,color("#FFCC00FF");effectcolor2,color("#FFCC0088"); +AutogenSetCommand= # - -[StreamDisplay] -PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ - local fItemWidth = ( 256 / numItems ) \ - self:zoomtowidth(fItemWidth); \ -end; -TextureCoordScaleX=1 -NumPills=1 - -[StepsDisplayEvaluation] -Fallback="StepsDisplay" +ShowStepsType=GetGamePrefB("AutoSetStyle") +# ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle") +StepsTypeX=-64-8 +StepsTypeY=0 +StepsTypeOnCommand= +StepsTypeSetCommand= [SongMeterDisplay] StreamWidth=380 @@ -466,32 +629,65 @@ TipX=0 TipY=0 TipOnCommand= TipOffCommand= - [SongMeterDisplayP1] Fallback="SongMeterDisplay" FrameOnCommand=sleep,2;linear,0.25;diffuse,PlayerColor(PLAYER_1);glow,1,1,1,0.5;decelerate,0.6;glow,1,1,1,0 - [SongMeterDisplayP2] Fallback="SongMeterDisplay" FrameOnCommand=sleep,2;linear,0.25;diffuse,PlayerColor(PLAYER_2);glow,1,1,1,0.5;decelerate,0.6;glow,1,1,1,0 +[StepsDisplayEvaluation] +Fallback="StepsDisplay" + +[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:zoomtowidth(fItemWidth); \ +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:effecttiming(1,0.01875*itemIndex,1,1-(0.01875*itemIndex)); \ + # self:effectclock('beatnooffset'); \ +# end; +TextureCoordScaleX=1 +NumPills=1 +AlwaysBounceNormalBar=false + [TextBanner] TitleOnCommand=horizalign,left;shadowlength,1; SubtitleOnCommand=horizalign,left;shadowlength,1; ArtistOnCommand=horizalign,left;shadowlength,1;skewx,-0.2 ArtistPrependString="" +AfterSetCommand=%TextBannerAfterSet -[WheelNotifyIcon] +[WheelnotifyIcon] -# 04 # [Screen] [ScreenDebugOverlay] [ScreenSystemLayer] CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,PlayerColor(PLAYER_1); +CreditsP1OffCommand= # CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,PlayerColor(PLAYER_2); +CreditsP2OffCommand= [ScreenConsoleOverlay] @@ -536,6 +732,8 @@ TimerX=SCREEN_RIGHT-36-4 TimerY=SCREEN_TOP+22 TimerOnCommand=draworder,6;visible,PREFSMAN:GetPreference("MenuTimer"); # TimerOnCommand=fov,90;vanishpoint,SCREEN_RIGHT-36-4,SCREEN_TOP+20;draworder,5;visible,PREFSMAN:GetPreference("MenuTimer");rotationy,90;decelerate,0.4;rotationy,0; +TimerOffCommand= +# TimerOffCommand=accelerate,0.4;rotationx,90; StageDisplayNumberOffset=1 @@ -561,6 +759,7 @@ ShowFooter=false [ScreenTextEntry] QuestionOnCommand=diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);wrapwidthpixels,600 AnswerOnCommand=diffuse,Color("Blue");glowshift; +KeysInitCommand=zoom,0.8;shadowlength,0 [ScreenInit] PrepareScreens="ScreenTitleMenu,ScreenTitleJoin" @@ -632,6 +831,20 @@ DefaultChoice="1" #ChoiceSetup="text,Setup" ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup" +[ScreenQuickSetupOverview] +IconStartX=SCREEN_CENTER_X-160 +IconStartY=SCREEN_BOTTOM-60 +IconSetX=SCREEN_CENTER_X-160 +IconSetY=SCREEN_BOTTOM-60 +IconBackX=SCREEN_CENTER_X+160 +IconBackY=SCREEN_BOTTOM-60 + +ExplanationX=SCREEN_CENTER_X +ExplanationY=SCREEN_BOTTOM-100 +ExplanationOnCommand=shadowlength,1;zoom,0.75;maxwidth,SCREEN_WIDTH/0.75; +ExplanationOffCommand= + + [ScreenProfileLoad] # ShowHeader=true @@ -666,8 +879,8 @@ Choice14Keys="name,14Keys;style,double14;screen,"..Branch.AfterSelectPlayMode() ChoiceKB7="name,kb7;style,single;screen,"..Branch.AfterSelectPlayMode() # ShowScroller=false -WrapScroller=false ShowIcon=true +WrapScroller=false UseIconMetrics=true # IconGainFocusCommand=stoptweening;bounceend,0.125;zoom,1; @@ -736,6 +949,10 @@ ScreenOutDelay=3 DefaultChoice="Easy" # ChoiceNames="Normal,Extended" # +PerChoiceIconElement=false +# +ShowScroller=true +WrapScroller=true ScrollerX=SCREEN_CENTER_X ScrollerY=SCREEN_CENTER_Y-60 ScrollerOnCommand=SetFastCatchup,true; @@ -790,19 +1007,6 @@ IconChoiceEndlessY=SCREEN_BOTTOM-88 IconChoiceEndlessOnCommand=zoom,0;bounceend,0.35;zoom,0.8 IconChoiceEndlessOffCommand=linear,0.1175;zoomx,0 -[ScreenQuickSetupOverview] -IconStartX=SCREEN_CENTER_X-160 -IconStartY=SCREEN_BOTTOM-60 -IconSetX=SCREEN_CENTER_X-160 -IconSetY=SCREEN_BOTTOM-60 -IconBackX=SCREEN_CENTER_X+160 -IconBackY=SCREEN_BOTTOM-60 - -ExplanationX=SCREEN_CENTER_X -ExplanationY=SCREEN_BOTTOM-100 -ExplanationOnCommand=shadowlength,1;zoom,0.75;maxwidth,SCREEN_WIDTH/0.75; -ExplanationOffCommand= - [ScreenSelectCharacter] [ScreenGameInformation] @@ -973,6 +1177,29 @@ CDTitleBackCommand=cullmode,'CullMode_Back' CDTitleOnCommand=draworder,106;shadowlength,1;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= +ScoreFrameP1Y= +ScoreFrameP1OnCommand=visible,false +ScoreFrameP1OffCommand= +ScoreP1X= +ScoreP1Y= +ScoreP1OnCommand=visible,false +ScoreP1OffCommand= +# +ScoreP2X= +ScoreP2Y= +ScoreP2OnCommand=visible,false +ScoreP2OffCommand= +ScoreFrameP2X= +ScoreFrameP2Y= +ScoreFrameP2OnCommand=visible,false +ScoreFrameP2OffCommand= +# +ScoreP1SortChangeCommand=stoptweening; +ScoreP2SortChangeCommand=stoptweening; +ScoreFrameP1SortChangeCommand=stoptweening; +ScoreFrameP2SortChangeCommand=stoptweening; +# ShowStepsDisplayP1=GAMESTATE:IsHumanPlayer(PLAYER_1) StepsDisplayP1X=SCREEN_CENTER_X-160 StepsDisplayP1Y=SCREEN_BOTTOM-60 @@ -1000,6 +1227,13 @@ PercentScoreP2OnCommand=player,PLAYER_2;addy,SCREEN_CENTER_Y;decelerate,0.35;add PercentScoreP2OffCommand=bouncebegin,0.15;zoomx,0; [ScreenSelectCourse] +#~ ScreenInitCommand=%function(self) \ + #~ GAMESTATE:ApplyGameCommand("sort,AllCourses",PLAYER_1); \ + #~ GAMESTATE:ApplyGameCommand("sort,AllCourses",PLAYER_2); \ +#~ end; +# +DefaultSort="Nonstop" +# ShowDifficultyList=false ShowCourseContentsList=true ShowNumCourseSongs=true @@ -1015,6 +1249,9 @@ ShowPaneDisplayTextP2=false [CourseCodeDetector] [StepsDisplay] +FrameX=0 +FrameY=0 +FrameOnCommand= FrameLoadCommand=%function(self,param) end; FrameSetCommand=%function(self,param) \ if param.CustomDifficulty then \ @@ -1023,9 +1260,17 @@ FrameSetCommand=%function(self,param) \ end; # ShowTicks=false +NumTicks=10 +MaxTicks=14 +TicksX=0 +TicksY=0 +TicksOnCommand=shadowlength,0; TicksSetCommand=%function(self,param) end; # +ShowMeter=true +ZeroMeterString="?" MeterX=56-32 +MeterY=0 MeterOnCommand=shadowlength,1;textglowmode,'TextGlowMode_Inner' MeterSetCommand=%function(self,param) \ if param.CustomDifficulty then \ @@ -1046,6 +1291,7 @@ MeterSetCommand=%function(self,param) \ end; \ end; # +ShowDescription=true DescriptionX=-20-32 DescriptionY=GetGamePrefB("AutoSetStyle") and -5 or 0 # DescriptionY=GetUserPrefB("UserPrefAutoSetStyle") and -5 or 0 @@ -1062,6 +1308,8 @@ end; # ShowAutogen=false AutogenX=40-32 +AutogenY=0 +AutogenOnCommand= AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.Difficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.Difficulty)); end end # ShowStepsType=GetGamePrefB("AutoSetStyle") @@ -1071,6 +1319,8 @@ StepsTypeY=7 StepsTypeOnCommand=zoom,0.45 [StepsDisplayGameplay] +Fallback="StepsDisplay" + FrameX=0 FrameY=0 FrameOnCommand= @@ -1136,22 +1386,19 @@ StepsTypeX=-20 StepsTypeY=7 StepsTypeOnCommand=zoom,0.45 -[ScreenStageInformation] -TimerOnCommand=visible,false -TimerSeconds=3 -# -WaitForChildrenBeforeTweening=true - [ScreenOptions] DisqualifyP1X=SCREEN_CENTER_X-176 DisqualifyP1Y=SCREEN_BOTTOM-98 DisqualifyP1OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_1 +DisqualifyP1OffCommand= DisqualifyP2X=SCREEN_CENTER_X+176 DisqualifyP2Y=SCREEN_BOTTOM-98 DisqualifyP2OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_2 +DisqualifyP2OffCommand= ContainerOnCommand=x,-SCREEN_WIDTH;decelerate,0.35;x,SCREEN_LEFT # PageOnCommand=fadetop,0.125;fadebottom,0.125;cropbottom,0.5;croptop,0.5;decelerate,0.25;croptop,0;cropbottom,0;fadetop,0;fadebottom,0; +CursorOnCommand= LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.25;fadeleft,0.05;faderight,0.05;diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25");effectclock,'beat' LineHighlightChangeCommand=linear,0.1;diffuse,Color("White");diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25") @@ -1166,6 +1413,8 @@ LineHighlightChangeToExitCommand=linear,0.1;diffuse,Color("Red");diffuseshift;ef [ScreenOptionsService] ShowHeader=false +# ScreenOptionsSystemDirection" + NumRowsShown=14 RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-170+24*offsetFromCenter) end @@ -1179,19 +1428,26 @@ SeparateExitRowY=SCREEN_BOTTOM-40 [ScreenOptionsServiceExtendedChild] [ScreenMiniMenu] +HeaderX=SCREEN_CENTER_X HeaderY=SCREEN_TOP HeaderOnCommand=draworder,100;visible,false +HeaderOffCommand= LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.3;fadeleft,0.25;faderight,0.25;diffusealpha,0.375 LineHighlightChangeCommand= LineHighlightChangeToExitCommand= [OptionRowMiniMenu] +Fallback="OptionRow" + TitleX=SCREEN_CENTER_X-320+48 TitleOnCommand=horizalign,left;shadowlength,0;uppercase,true;zoom,0.6375;strokecolor,Color("Black"); +#~ TitleGainFocusCommand= +#~ TitleLoseFocusCommand= ColorSelected=color("1,1,1,1") ColorNotSelected=color("0.9,0.9,0.9,1") +ColorDisabled=color("0.5,0.5,0.5,1") ItemOnCommand=zoom,0.6375 ItemsLongRowP1X=SCREEN_CENTER_X-240 @@ -1212,6 +1468,7 @@ ItemsLongRowP2X=SCREEN_CENTER_X ItemsLongRowSharedX=SCREEN_CENTER_X [OptionRowMiniMenuContext] +Fallback="OptionRowMiniMenu" [ScreenMapControllers] @@ -1238,6 +1495,9 @@ LineRollCombo="lua,UserPrefComboOnRolls()" [ScreenOptionsArcade] [ScreenOptionsTheme] +Fallback="ScreenOptionsServiceChild" +NextScreen="ScreenOptionsExtended" +PrevScreen="ScreenOptionsExtended" LineNames="gNotePos,gAuto,gScore,gSScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter" LinegNotePos="lua,UserPrefNotePosition()" LinegScore="lua,UserPrefGameplayShowScore()" @@ -1262,22 +1522,41 @@ LineGameplayFooter="lua,UserPrefGameplayFooter()" [ScreenPlayerOptions] LineNames=GetDefaultOptionLines() +#~ LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17" +Line1="lua,SpeedMods()" +#~ Line1="list,Speed" +Line2="list,Accel" +Line3="list,Effect" +Line4="list,Appearance" +Line5="list,Turn" +Line6="list,Insert" +LineR="list,Remove" +Line7="list,Scroll" +Line8="list,NoteSkins" +Line9="list,Holds" +Line10="list,Mines" +Line11="list,Attacks" +Line12="list,PlayerAutoPlay" +Line13="list,Hide" +Line14="list,Persp" +Line15="list,ScoreDisplay" +Line16="list,Steps" Line17="lua,OptionRowProTiming()" Line18="list,Characters" [ScreenPlayerOptionsRestricted] -[ScreenSongOptions] +[ScreenSplash] -# 05 # A [ScreenExit] -[ScreenAttract] +[ScreenAttact] [ScreenRanking] -# 05 # C [ScreenGameplay] +ShowLifeMeterForDisabledPlayers=false +# SongMeterDisplayX=SCREEN_CENTER_X SongMeterDisplayY=SCREEN_TOP+50 SongMeterDisplayOnCommand=draworder,50;zoom,0;y,SCREEN_TOP-24;sleep,1.5;decelerate,0.5;zoom,1;y,SCREEN_TOP+50 @@ -1409,21 +1688,6 @@ PlayerOptionsP2Y=SCREEN_CENTER_Y+24 PlayerOptionsP2OnCommand=draworder,101;vertalign,top;wrapwidthpixels,256*2;zoom,0.5;diffusealpha,0;addy,10;smooth,0.3;diffusealpha,1;addy,-10;sleep,3;smooth,0.5;addy,10;diffusealpha,0 PlayerOptionsP2OffCommand= # -LyricDisplaySetNoReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+160 -LyricDisplaySetReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-140 -# This is used if one player is in reverse and the other isn't. -LyricDisplaySetOneReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-160; -LyricDisplayDefaultColor=Color("White") -# -ActiveAttackListP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") -ActiveAttackListP1Y= -ActiveAttackListP1OnCommand=visible,false -ActiveAttackListP1OffCommand= -ActiveAttackListP2X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") -ActiveAttackListP2Y= -ActiveAttackListP2OnCommand=visible,false -ActiveAttackListP2OffCommand= -# StepsDisplayP1X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") # StepsDisplayP1X=(PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") StepsDisplayP1Y=SCREEN_CENTER_Y @@ -1445,15 +1709,42 @@ SongOptionsY=SCREEN_BOTTOM-32 SongOptionsOnCommand=draworder,101;zoom,0.5 SongOptionsOffCommand= # +OniGameOverP1X= +OniGameOverP1Y= +OniGameOverP1OnCommand= +OniGameOverP1OffCommand= +# +OniGameOverP2X= +OniGameOverP2Y= +OniGameOverP2OnCommand= +OniGameOverP2OffCommand= +# SurviveTimeX=SCREEN_CENTER_X SurviveTimeY=SCREEN_CENTER_Y+40 SurviveTimeOnCommand=shadowlength,1;zoomx,0;bounceend,1;zoomx,1 SurviveTimeOffCommand=shadowlength,1;linear,1;zoom,0.75;diffusealpha,0 - +# +ActiveAttackListP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") +ActiveAttackListP1Y= +ActiveAttackListP1OnCommand=visible,false +ActiveAttackListP1OffCommand= +ActiveAttackListP2X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") +ActiveAttackListP2Y= +ActiveAttackListP2OnCommand=visible,false +ActiveAttackListP2OffCommand= +# +LyricDisplaySetNoReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+160 +LyricDisplaySetReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-140 +# This is used if one player is in reverse and the other isn't. +LyricDisplaySetOneReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-160; +LyricDisplayDefaultColor=Color("White") [ScreenGameplayShared] [ScreenEvaluation] +Class="ScreenEvaluation" +Fallback="ScreenWithMenuElements" +# StageDisplayNumberOffset=0 # NextScreen=Branches.AfterEvaluation() @@ -1778,6 +2069,8 @@ SongInformationOnCommand=playcommand,"Set";draworder,105 SongInformationOffCommand= [ScreenEvaluationNormal] +Fallback="ScreenEvaluation" +# PlayMusic=false # ShowBannerFrame=false @@ -1789,10 +2082,14 @@ StageDisplayOnCommand=draworder,105;fov,90;vertalign,bottom;vanishpoint,SCREEN_C StageDisplayOffCommand= [ScreenEvaluationSummary] +Fallback="ScreenEvaluation" +# NextScreen=Branch.AfterSummary # PlayMusic=false # +Summary=true +# ShowStageDisplay=false # SmallBanner1X=SCREEN_CENTER_X-72 @@ -1867,6 +2164,8 @@ Fallback="StepsDisplayGameplay" [ScreenMiniMenuStepsInformation] +[ScreenMiniMenuSongInformation] + [ScreenMiniMenuTimingDataInformation] [ScreenMiniMenuBackgroundChange] @@ -1881,14 +2180,12 @@ Fallback="StepsDisplayGameplay" [ScreenMiniMenuCourseOptions] -# Export Packages [ScreenOptionsExportPackage] [ScreenOptionsManage] [OptionRowManage] -# Manage Courses [OptionRowCourseOverview] [ScreenOptionsManageCourses] @@ -1901,7 +2198,6 @@ Fallback="StepsDisplayGameplay" [ScreenOptionsCourseOverview] -# visual/interactive syncing [ScreenGameplaySyncMachine] SongMeterDisplayP1OnCommand=visible,false SongMeterDisplayP2OnCommand=visible,false @@ -1914,7 +2210,6 @@ PlayerOptionsP2OnCommand=visible,false [PlayerSyncMachine] -# sm-ssc helper screens [ScreenHowToInstallSongs] Class="ScreenSelectMaster" Fallback="ScreenSelectMaster" @@ -1944,7 +2239,6 @@ DefaultChoice="WhereToFind" OptionOrderUp="5:4,4:3,3:2,2:1,1:5" OptionOrderDown="1:2,2:3,3:4,4:5,5:1" -# stuff for online mode: [ScreenSMOnlineLogin] [ScreenNetSelectBase] @@ -1983,7 +2277,7 @@ DifficultyDisplayY=SCREEN_CENTER_Y+185 DifficultyDisplayOnCommand=draworder,105;fov,90;zoom,1;zoomy,0;sleep,0.35;smooth,0.35;zoomy,1 DifficultyDisplayOffCommand=linear,0.25;zoomy,0; -[ScreenDisplayNet] +[StepsDisplayNet] [ScreenNetRoom] @@ -2011,6 +2305,7 @@ DifficultyDisplayOffCommand=linear,0.25;zoomy,0; UserTier02OrBetterCommand=diffuseshift;effectperiod,0.75;effectcolor1,color("1,0.95,0.8,1");effectcolor2,color("0.8,0.95,1,1") # arcade stuff + [ScreenLogo] TimerSeconds=10 ShowLogo=true @@ -2054,6 +2349,13 @@ ScrollerOnCommand=visible,false; ArcadeOverlay.TextY=SCREEN_BOTTOM-128 +[ScreenStageInformation] +ForceTimer=true +TimerOnCommand=visible,false +TimerSeconds=3 +# +WaitForChildrenBeforeTweening=true + [ScreenDemonstration] SongMeterDisplayOnCommand=visible,false SongMeterDisplayP1OnCommand=visible,false @@ -2065,6 +2367,8 @@ ScoreP2OnCommand=visible,false StepsDisplayP1OnCommand=zoomy,0;linear,0.3;zoomy,1;sleep,3;smooth,0.5;y,SCREEN_BOTTOM-20;zoomy,0 StepsDisplayP2OnCommand=zoomy,0;linear,0.3;zoomy,1;sleep,3;smooth,0.5;y,SCREEN_BOTTOM-20;zoomy,0 ShowBPMDisplay=false +# +PlayMusic=false [ScreenJukeboxMenu]