diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 56624e357f..f5638d1633 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -342,6 +342,7 @@ TipShowTime=4 TipSwitchTime=1 # The Command when its made TipOnCommand=shadowlength,0;diffuseblink + [Judgment] # New # JudgmentOnCommand= @@ -633,7 +634,6 @@ DancePointsP2Y=0 DancePointsP2OnCommand=zoom,0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) DancePointsP2OffCommand= - [LifeMeterTime] # The Lifemeter that shows up when you're playing survival. diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 0df3e9d818..cc5f4b82f9 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -153,13 +153,9 @@ NumLivesP2OnCommand=zoomx,-1 # still asking for this even though it's in fallback... -aj Format= # -DancePointsP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) -DancePointsP2OffCommand= -# -PercentP2X=0 -PercentP2Y=0 PercentP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) -PercentP2OffCommand= +# +DancePointsP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2) [LifeMeterTime] @@ -174,10 +170,8 @@ TitleGainFocusCommand=stoptweening;zoom,0.6375*1.125;bounceend,0.2;diffuse,Color TitleLoseFocusCommand=diffuse,Color("White");strokecolor,Color("Black");stopeffect; [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) @@ -220,17 +214,14 @@ 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] SwitchSeconds=0.08 -RouletteSwitchSeconds=0.05 -RouletteSlowDownSwitches=5 LockedInitialVelocity=7 ; linear wheel example: ; ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ @@ -246,21 +237,15 @@ LockedInitialVelocity=7 ; self:z( -100 + WHEEL_3D_RADIUS * math.cos(rotationx_radians) ); \ ; 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") @@ -302,11 +287,8 @@ 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 @@ -321,7 +303,6 @@ GradeP1X=106+16 GradeP1Y=-8 GradeP2X=110+16 GradeP2Y=8 -GradesShowMachine=true [NoteField] ShowBoard=GAMESTATE:GetCurrentGame():GetName() == "kb7" @@ -342,15 +323,10 @@ 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; DeltaSecondsGainLifeCommand=zoom,0.5;settext,"Hi!"; @@ -360,44 +336,20 @@ 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] -# This shouldn't even be named this but whatever man. -PercentP1X=0 -PercentP1Y=0 +# TODO: Come up with a better name? 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) ); @@ -407,10 +359,7 @@ 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 @@ -423,16 +372,12 @@ 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) )); \ @@ -441,17 +386,12 @@ 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)); \ @@ -470,7 +410,6 @@ 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) \ @@ -488,39 +427,15 @@ 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= # -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: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 [StepsDisplayEvaluation] Fallback="StepsDisplay" @@ -561,7 +476,6 @@ TitleOnCommand=horizalign,left;shadowlength,1; SubtitleOnCommand=horizalign,left;shadowlength,1; ArtistOnCommand=horizalign,left;shadowlength,1;skewx,-0.2 ArtistPrependString="" -AfterSetCommand=%TextBannerAfterSet [WheelNotifyIcon] @@ -572,10 +486,8 @@ AfterSetCommand=%TextBannerAfterSet [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] @@ -620,8 +532,6 @@ 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 @@ -647,7 +557,6 @@ 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" @@ -753,8 +662,8 @@ Choice14Keys="name,14Keys;style,double14;screen,"..Branch.AfterSelectPlayMode() ChoiceKB7="name,kb7;style,single;screen,"..Branch.AfterSelectPlayMode() # ShowScroller=false -ShowIcon=true WrapScroller=false +ShowIcon=true UseIconMetrics=true # IconGainFocusCommand=stoptweening;bounceend,0.125;zoom,1; @@ -823,10 +732,6 @@ 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; @@ -1064,29 +969,6 @@ 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 @@ -1114,13 +996,6 @@ 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 @@ -1136,9 +1011,6 @@ ShowPaneDisplayTextP2=false [CourseCodeDetector] [StepsDisplay] -FrameX=0 -FrameY=0 -FrameOnCommand= FrameLoadCommand=%function(self,param) end; FrameSetCommand=%function(self,param) \ if param.CustomDifficulty then \ @@ -1147,17 +1019,9 @@ 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 \ @@ -1178,7 +1042,6 @@ 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 @@ -1195,8 +1058,6 @@ 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") @@ -1206,8 +1067,6 @@ StepsTypeY=7 StepsTypeOnCommand=zoom,0.45 [StepsDisplayGameplay] -Fallback="StepsDisplay" - FrameX=0 FrameY=0 FrameOnCommand= @@ -1274,7 +1133,6 @@ StepsTypeY=7 StepsTypeOnCommand=zoom,0.45 [ScreenStageInformation] -ForceTimer=true TimerOnCommand=visible,false TimerSeconds=3 # @@ -1284,15 +1142,12 @@ WaitForChildrenBeforeTweening=true 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") @@ -1307,8 +1162,6 @@ 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 @@ -1322,26 +1175,19 @@ 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 @@ -1362,7 +1208,6 @@ ItemsLongRowP2X=SCREEN_CENTER_X ItemsLongRowSharedX=SCREEN_CENTER_X [OptionRowMiniMenuContext] -Fallback="OptionRowMiniMenu" [ScreenMapControllers] @@ -1389,9 +1234,6 @@ 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()" @@ -1416,25 +1258,6 @@ 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" @@ -1442,6 +1265,7 @@ Line18="list,Characters" [ScreenSongOptions] +# 05 # A [ScreenExit] [ScreenAttract] @@ -1450,8 +1274,6 @@ Line18="list,Characters" # 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 @@ -1583,6 +1405,21 @@ 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 @@ -1604,42 +1441,15 @@ 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() @@ -1964,8 +1774,6 @@ SongInformationOnCommand=playcommand,"Set";draworder,105 SongInformationOffCommand= [ScreenEvaluationNormal] -Fallback="ScreenEvaluation" -# PlayMusic=false # ShowBannerFrame=false @@ -1977,14 +1785,10 @@ 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 @@ -2017,6 +1821,8 @@ SmallBanner6Y=SCREEN_TOP+100+24 SmallBanner6OnCommand=zoom,0.5 SmallBanner6OffCommand= +[ScreenNameEntry] + [ScreenProfileSave] [ScreenProfileSaveSummary] @@ -2255,8 +2061,6 @@ 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]