[default -> sm130futures] Update the branch.

This commit is contained in:
Jason Felds
2011-04-04 15:22:45 -04:00
22 changed files with 909 additions and 787 deletions
+44 -8
View File
@@ -64,6 +64,7 @@ OverlayScreens="ScreenSystemLayer,ScreenSyncOverlay,ScreenStatsOverlay,ScreenDeb
PercentScoreDecimalPlaces=2
# 02 #
[LightsManager]
# Mostly useless since it doesn't work, as well as that barely anyone has
# lights to play around with.
@@ -128,6 +129,7 @@ AutoLockChallengeSteps=false
UnlockNames=""
# 03 #
[ArrowEffects]
# Complicated stuff you probably shouldn't ever mess with or else you'll
# destroy mods completely!
@@ -233,6 +235,11 @@ FormatString="%03.0f"
[CodeDetector]
# Codes on the MusicWheel that change stuff!
# For Future Reference:
# @ = Holding
# - = In Conjuction With / Then
# ~ = Released
# + = At The Same Time
PrevSteps1="Up,Up"
PrevSteps2="MenuUp,MenuUp"
NextSteps1="Down,Down"
@@ -279,6 +286,7 @@ SaveScreenshot1="MenuLeft-MenuRight"
SaveScreenshot2=""
CancelAllPlayerOptions="Left,Right,Left,Right,Left,Right"
BackInEventMode=""
[CodeDetectorOnline]
Fallback="CodeDetector"
PrevSteps1="MenuUp,MenuUp"
@@ -337,6 +345,7 @@ TipShowTime=4
TipSwitchTime=1
# The Command when its made
TipOnCommand=shadowlength,0;diffuseblink
[Judgment]
# New #
JudgmentOnCommand=
@@ -438,6 +447,7 @@ PumpRoutineString="Routine"
# Difficulty_Edit-StepsType_Pump_Halfdouble=Edit
# Difficulty_Edit-StepsType_Pump_Double=Edit
# Course=Progressive
[CustomScoring]
# Custom scoring, usually good for custom games.
@@ -464,6 +474,7 @@ PointsCheckpointMiss=-5
PointsNone=0
PointsHoldHeld=+5
PointsHoldLetGo=-5
[DifficultyList]
# A list that shows difficulties in a song.
CapitalizeDifficultyNames=false
@@ -585,6 +596,7 @@ StreamX=0
StreamY=0
OverX=0
OverY=0
[LifeMeterBattery]
# The bar that shows up in Oni mode.
@@ -627,7 +639,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.
@@ -838,16 +849,19 @@ PortalColor=color("1,0,0,1")
SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Artist", "SortOrder_Genre" }
# SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Popularity", "SortOrder_Artist", "SortOrder_Genre" }
#
ShowRoulette=true
ShowRandom=false
ShowPortal=false
#
SortBPMDivision=20
SortLengthDivision=5
MostPlayedSongsToShow=30
RecentSongsToShow=30
#
UseEasyMarkerFlag=false
#
ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter,ChallengeMeter,DoubleEasyMeter,DoubleMediumMeter,DoubleHardMeter,DoubleChallengeMeter,Genre,Length,Recent"
# ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter,ChallengeMeter,DoubleEasyMeter,DoubleMediumMeter,DoubleHardMeter,DoubleChallengeMeter,Genre,Length,Recent,NormalMode,BattleMode"
ChoicePreferred="sort,Preferred"
@@ -870,7 +884,7 @@ ChoiceLength="sort,Length"
ChoiceRecent="sort,Recent"
ChoiceNormalMode="playmode,regular"
ChoiceBattleMode="playmode,battle"
#
CustomWheelItemNames=""
[CourseWheel]
@@ -1098,7 +1112,6 @@ TextOffCommand=
[ScoreDisplayOni]
[ScoreDisplayLifeTime]
FrameX=
FrameY=
@@ -1248,6 +1261,7 @@ SoundProperty="Pitch"
PropertyMin=7/8
PropertyCenter=1.0
PropertyMax=9/8
[StepsDisplayListRow]
FrameX=0
FrameY=0
@@ -1324,6 +1338,7 @@ ShowTraining=false
BlinkPlayersBest=true
# 04 #
[Screen]
ScreenInitCommand=
ScreenOnCommand=
@@ -1374,6 +1389,7 @@ HeaderTextOffCommand=
LineOnCommand=zoom,0.75
#
[ScreenSystemLayer]
Class="ScreenSystemLayer"
Fallback="Screen"
@@ -1424,6 +1440,7 @@ Fallback="Screen"
StatusOnCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+150;shadowlength,2;strokecolor,color("#000000");
AdjustmentsOnCommand=x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y;
#
[ScreenStatsOverlay]
Class="ScreenStatsOverlay"
Fallback="Screen"
@@ -1437,6 +1454,7 @@ SkipOnCommand=zoom,0.5
SkipWidth=190
SkipSpacingY=14
#
[ScreenWithMenuElements]
Class="ScreenWithMenuElements"
Fallback="Screen"
@@ -1831,6 +1849,7 @@ PerChoiceIconElement=false
ShowScroller=true
WrapScroller=true
ShowIcon=false
[ScreenGameInformation]
Class="ScreenSelectMaster"
Fallback="ScreenSelectMaster"
@@ -1955,6 +1974,7 @@ ScreenModsCommand=setupcoursestagemods
#
MusicWheelType="CourseWheel"
Codes="CourseCodeDetector"
[CourseCodeDetector]
Fallback="CodeDetector"
NextSort1=
@@ -1962,7 +1982,6 @@ NextSort2=
NextSort3=
NextSort4=
[StepsDisplay]
FrameX=0
FrameY=0
@@ -2516,6 +2535,7 @@ ExplanationTogetherOffCommand=
[ScreenOptionsServiceExtendedChild]
Fallback="ScreenOptionsServiceChild"
[ScreenMiniMenu]
Class="ScreenMiniMenu"
Fallback="ScreenOptions"
@@ -2835,12 +2855,14 @@ Line16="list,Steps"
Line17="list,Characters"
#
[ScreenPlayerOptionsRestricted]
Fallback="ScreenPlayerOptions"
NextScreen="ScreenStageInformation"
LineNames="1,8,16,17"
# funny
[ScreenSongOptions]
Fallback="ScreenOptions"
Class="ScreenSongOptions"
@@ -2875,6 +2897,7 @@ AllowStartToSkip=false
PrepareScreen=
# 05 # A
[ScreenExit]
# Midiman:
# Fun fact, if you don't enable this screen, Force Crashing will hang
@@ -3287,6 +3310,7 @@ DisqualifiedP2OffCommand=
#
DetailLineFormat="%3d/%3d"
#
[ScreenEvaluationNormal]
Fallback="ScreenEvaluation"
#
@@ -3339,11 +3363,13 @@ NextScreen=Branch.AfterProfileSave()
PrevScreen=Branch.TitleMenu()
#
TimerSeconds=-1
[ScreenProfileSaveSummary]
Fallback="ScreenProfileSave"
#
NextScreen="ScreenGameOver"
PrevScreen="ScreenGameOver"
[ScreenGameOver]
Class="ScreenEnding"
Fallback="ScreenAttract"
@@ -3406,6 +3432,7 @@ Answer3Of3OffCommand=
#
# stuff for edit mode:
#
[ScreenOptionsEdit]
Class="ScreenOptionsMaster"
Fallback="ScreenOptionsSimpleService"
@@ -3534,6 +3561,7 @@ TimerSeconds=-1
HelpText=Screen.String("HelpTextOptionsAndBack")
# could use a redo but whatever
[ScreenEdit]
Class="ScreenEdit"
Fallback="ScreenWithMenuElementsBlank"
@@ -3639,6 +3667,7 @@ OutCancelCommand=
Fallback="StepsDisplay"
# oh, right, minimenus.
[ScreenMiniMenuEditHelp]
Fallback="ScreenMiniMenu"
ShowFooter=false
@@ -3700,6 +3729,7 @@ Fallback="ScreenMiniMenu"
Fallback="ScreenMiniMenu"
# Export Packages
[ScreenOptionsExportPackage]
Class="ScreenOptionsExportPackage"
Fallback="ScreenOptionsSimpleService"
@@ -3717,6 +3747,7 @@ Fallback="OptionRowService"
TitleX=SCREEN_CENTER_X-150
# Manage Courses
[OptionRowCourseOverview]
Fallback="OptionRowService"
ItemsLongRowSharedX=SCREEN_CENTER_X-100
@@ -3765,6 +3796,7 @@ EditScreen="ScreenOptionsEditCourse"
OptionRowNormalMetricsGroup="OptionRowCourseOverview"
# visual/interactive syncing
[ScreenGameplaySyncMachine]
Class="ScreenGameplaySyncMachine"
Fallback="ScreenGameplay"
@@ -3794,6 +3826,7 @@ Fallback="Player"
ComboOnCommand=visible,false
# sm-ssc helper screens
[ScreenHowToInstallSongs]
Class="ScreenSplash"
Fallback="ScreenSplash"
@@ -3804,6 +3837,7 @@ TimerSeconds=-1
ShowHelp=false
# stuff for online mode:
[ScreenSMOnlineLogin]
Class="ScreenSMOnlineLogin"
Fallback="ScreenOptionsServiceChild"
@@ -4048,6 +4082,7 @@ UserOnCommand=
UserOffCommand=
# Arcade
[ScreenLogo]
Fallback="ScreenAttract"
#
@@ -4111,6 +4146,7 @@ ChoiceNames="1"
IdleCommentSeconds=-1
IdleTimeoutSeconds=-1
IdleTimeoutScreen=Branch.AfterInit()
[ScreenDemonstration]
Fallback="ScreenGameplay"
Class="ScreenDemonstration"