Fixed conflicts to merge kickbox in.
This commit is contained in:
@@ -771,10 +771,8 @@ FOV=90
|
||||
PerChoiceScrollElement=false
|
||||
PerChoiceIconElement=false
|
||||
#
|
||||
Choice7Keys="name,7Keys;style,single7;screen,"..Branch.AfterSelectStyle()
|
||||
Choice10Keys="name,10Keys;style,double5;screen,"..Branch.AfterSelectStyle()
|
||||
Choice14Keys="name,14Keys;style,double7;screen,"..Branch.AfterSelectStyle()
|
||||
ChoiceKB7="name,kb7;style,single;screen,"..Branch.AfterSelectStyle()
|
||||
# Having one lua function is so much better than dozens of metrics. -Kyz
|
||||
ChoiceNames="lua,ScreenSelectStyleChoices()"
|
||||
#
|
||||
ShowScroller=false
|
||||
ShowIcon=true
|
||||
@@ -784,65 +782,10 @@ UseIconMetrics=true
|
||||
IconGainFocusCommand=stoptweening;bounceend,0.05;zoom,1;
|
||||
IconLoseFocusCommand=stoptweening;decelerate,0.1;zoom,0.8;
|
||||
#
|
||||
IconChoiceSingleX=SCREEN_CENTER_X-160
|
||||
IconChoiceSingleY=SCREEN_CENTER_Y-96
|
||||
IconChoiceSingleOnCommand=zoom,0;bounceend,0.35;zoom,1
|
||||
IconChoiceSingleOffCommand=linear,0.05;zoomx,0
|
||||
IconChoicePosFunction=ScreenSelectStylePositions
|
||||
IconChoiceOnCommand=zoom,0;bounceend,0.35;zoom,1
|
||||
IconChoiceOffCommand=linear,0.05;zoomx,0
|
||||
#
|
||||
IconChoiceDoubleX=SCREEN_CENTER_X-160
|
||||
IconChoiceDoubleY=SCREEN_CENTER_Y
|
||||
IconChoiceDoubleOnCommand=zoom,0;bounceend,0.35;zoom,1
|
||||
IconChoiceDoubleOffCommand=linear,0.05;zoomx,0
|
||||
####
|
||||
IconChoiceSoloX=SCREEN_CENTER_X-160
|
||||
IconChoiceSoloY=SCREEN_CENTER_Y+96
|
||||
IconChoiceSoloOnCommand=zoom,0;bounceend,0.35;zoom,1
|
||||
IconChoiceSoloOffCommand=linear,0.05;zoomx,0
|
||||
#
|
||||
IconChoiceHalfDoubleX=SCREEN_CENTER_X-160
|
||||
IconChoiceHalfDoubleY=SCREEN_CENTER_Y+96
|
||||
IconChoiceHalfDoubleOnCommand=zoom,0;bounceend,0.35;zoom,1
|
||||
IconChoiceHalfDoubleOffCommand=linear,0.05;zoomx,0
|
||||
####
|
||||
IconChoiceVersusX=SCREEN_CENTER_X+160
|
||||
IconChoiceVersusY=string.find(THEME:GetMetric("ScreenSelectStyle","ChoiceNames"),"Routine") and SCREEN_CENTER_Y-96 or SCREEN_CENTER_Y-48
|
||||
IconChoiceVersusOnCommand=zoom,0;bounceend,0.35;zoom,1
|
||||
IconChoiceVersusOffCommand=linear,0.05;zoomx,0
|
||||
#
|
||||
IconChoiceCoupleX=SCREEN_CENTER_X+160
|
||||
IconChoiceCoupleY=string.find(THEME:GetMetric("ScreenSelectStyle","ChoiceNames"),"Routine") and SCREEN_CENTER_Y or SCREEN_CENTER_Y+48
|
||||
IconChoiceCoupleOnCommand=zoom,0;bounceend,0.35;zoom,1
|
||||
IconChoiceCoupleOffCommand=linear,0.05;zoomx,0
|
||||
#
|
||||
IconChoiceRoutineX=SCREEN_CENTER_X+160
|
||||
IconChoiceRoutineY=SCREEN_CENTER_Y+96
|
||||
IconChoiceRoutineOnCommand=zoom,0;bounceend,0.35;zoom,1
|
||||
IconChoiceRoutineOffCommand=linear,0.05;zoomx,0
|
||||
#
|
||||
IconChoicekb7X=SCREEN_CENTER_X
|
||||
IconChoicekb7Y=SCREEN_CENTER_Y
|
||||
IconChoicekb7OnCommand=zoom,0;bounceend,0.35;zoom,1
|
||||
IconChoicekb7OffCommand=linear,0.05;zoomx,0
|
||||
#
|
||||
IconChoice5KeysX=SCREEN_CENTER_X-160
|
||||
IconChoice5KeysY=SCREEN_CENTER_Y-48
|
||||
IconChoice5KeysOnCommand=zoom,0;bounceend,0.35;zoom,1
|
||||
IconChoice5KeysOffCommand=linear,0.05;zoomx,0
|
||||
#
|
||||
IconChoice7KeysX=SCREEN_CENTER_X-160
|
||||
IconChoice7KeysY=SCREEN_CENTER_Y+48
|
||||
IconChoice7KeysOnCommand=zoom,0;bounceend,0.35;zoom,1
|
||||
IconChoice7KeysOffCommand=linear,0.05;zoomx,0
|
||||
#
|
||||
IconChoice10KeysX=SCREEN_CENTER_X+160
|
||||
IconChoice10KeysY=SCREEN_CENTER_Y-48
|
||||
IconChoice10KeysOnCommand=zoom,0;bounceend,0.35;zoom,1
|
||||
IconChoice10KeysOffCommand=linear,0.05;zoomx,0
|
||||
#
|
||||
IconChoice14KeysX=SCREEN_CENTER_X+160
|
||||
IconChoice14KeysY=SCREEN_CENTER_Y+48
|
||||
IconChoice14KeysOnCommand=zoom,0;bounceend,0.35;zoom,1
|
||||
IconChoice14KeysOffCommand=linear,0.05;zoomx,0
|
||||
|
||||
[ScreenSelectPlayMode]
|
||||
PersistScreens="ScreenSelectPlayMode,ScreenSelectMusic"
|
||||
|
||||
Reference in New Issue
Block a user