cleanup metrics fallback order

2005-02-27 10:30:53 +00:00
parent 5a3b97c5f2
commit 56c0a77199
7 changed files with 87 additions and 58 deletions
@@ -0,0 +1 @@
+_blank
@@ -0,0 +1 @@
+_blank
@@ -0,0 +1 @@
+_blank
@@ -0,0 +1 @@
+_blank
@@ -0,0 +1 @@
+_blank
@@ -0,0 +1 @@
+_blank
@@ -42,7 +42,7 @@ UnlockNames=
 # the displayed text, which might be translated or otherwise changed.  The "name,foo"
 # parameter to ModeChoices is an asset name, which is used in filenames.
 Class=ScreenTitleMenu
-Fallback=ScreenCaution
+Fallback=ScreenSelectMasterBlank
 PrevScreen=ScreenCompany
 CoinModeChangeScreen=@ScreenTitleBranch()
 SharedPreviewAndCursor=1
@@ -111,60 +111,9 @@ Fallback=ScreenTitleMenu
 ChoiceNames=1

 [ScreenCaution]
+Fallback=ScreenSelectMasterBlank
 PrevScreen=@ScreenTitleBranch()
-Class=ScreenSelectMaster
-Fallback=ScreenSelectMaster
-ChoiceNames=1
 Choice1=screen,ScreenSelectStyle
-WrapCursor=1
-DefaultChoice=1
-SharedPreviewAndCursor=0
-NumCursorParts=0
-NumIconParts=0
-NumPreviewParts=0
-ShowScroller=0
-OptionOrderUp=
-OptionOrderDown=
-OptionOrderLeft=
-OptionOrderRight=
-OptionOrderAuto=
-NumChoicesOnPage1=1
-HeaderX=
-HeaderY=
-HeaderOnCommand=hidden,0
-HeaderOffCommand=
-FooterX=
-FooterY=
-FooterOnCommand=hidden,0
-FooterOffCommand=
-StyleIcon=0
-MemoryCardIcons=0
-TimerSeconds=5
-TimerStealth=1
-ForceTimer=1
-TimerX=
-TimerY=
-TimerOnCommand=hidden,1
-TimerOffCommand=
-ExplanationPage1X=
-ExplanationPage1Y=
-ExplanationPage1OnCommand=hidden,1
-ExplanationPage1OffCommand=
-ExplanationPage2X=
-ExplanationPage2Y=
-ExplanationPage2OnCommand=hidden,1
-ExplanationPage2OffCommand=
-MorePage1X=
-MorePage1Y=
-MorePage1OnCommand=hidden,1
-MorePage1OffCommand=
-MorePage2X=
-MorePage2Y=
-MorePage2OnCommand=hidden,1
-MorePage2OffCommand=
-ExtraSleepAfterTweenOffSeconds=0
-IdleCommentSeconds=15
-IdleTimeoutSeconds=0

 [ScreenEz2SelectPlayer]
 JoinFrameP1X=SCREEN_CENTER_X-200
@@ -2422,8 +2371,8 @@ TimerOnCommand=draworder,97;addx,SCREEN_WIDTH;spring,0.5;addx,-SCREEN_WIDTH
 TimerOffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH;
 TimerStealth=0
 ForceTimer=0
-OverlayX=SCREEN_CENTER_X
-OverlayY=SCREEN_CENTER_Y
+OverlayX=0
+OverlayY=0
 OverlayOnCommand=
 OverlayOffCommand=
 UnderlayX=0
@@ -2934,6 +2883,7 @@ AttackDurationSeconds=10

 [ScreenSelectMaster]
 Fallback=ScreenWithMenuElements
+Class=ScreenSelectMaster
 WrapCursor=0
 PreSwitchPageSeconds=0
 PostSwitchPageSeconds=0
@@ -2959,8 +2909,6 @@ NumChoicesOnPage1=999
 SharedPreviewAndCursor=1
 CursorPart1P1OffsetXFromIcon=0
 CursorPart1P1OffsetYFromIcon=0
-PreSwitchPageSeconds=0
-PostSwitchPageSeconds=0
 DisabledColor=#606060

 # Blank defaults for a few options.
@@ -3189,6 +3137,80 @@ TimerSeconds=0

 [ScreenAttract]
 StartScreen=@ScreenTitleBranch()
+Fallback=ScreenWithMenuElementsBlank
+
+[ScreenWithMenuElementsBlank]
+Fallback=ScreenWithMenuElements
+HeaderX=
+HeaderY=
+HeaderOnCommand=hidden,0
+HeaderOffCommand=
+FooterX=
+FooterY=
+FooterOnCommand=hidden,0
+FooterOffCommand=
+StyleIcon=0
+MemoryCardIcons=0
+TimerSeconds=5
+TimerStealth=1
+ForceTimer=1
+TimerX=
+TimerY=
+TimerOnCommand=hidden,1
+TimerOffCommand=
+
+[ScreenSelectMasterBlank]
+Fallback=ScreenWithMenuElementsBlank
+Class=ScreenSelectMaster
+ChoiceNames=1
+Choice1=
+DefaultChoice=1
+WrapCursor=0
+PreSwitchPageSeconds=0
+PostSwitchPageSeconds=0
+ScrollerSecondsPerItem=0
+ScrollerNumItemsToDraw=0
+ScrollerSpacingX=0
+ScrollerSpacingY=0
+StyleIcon=1
+MemoryCardIcons=1
+ExtraSleepAfterTweenOffSeconds=0
+NumCodes=0
+OptionOrderUp=
+OptionOrderDown=
+OptionOrderLeft=
+OptionOrderRight=
+OptionOrderAuto=
+NumIconParts=0
+NumCursorParts=0
+NumPreviewParts=0
+ShowScroller=0
+# All on page 1 by default.
+NumChoicesOnPage1=999
+SharedPreviewAndCursor=1
+CursorPart1P1OffsetXFromIcon=0
+CursorPart1P1OffsetYFromIcon=0
+DisabledColor=#606060
+
+ExplanationPage1X=
+ExplanationPage1Y=
+ExplanationPage1OnCommand=hidden,1
+ExplanationPage1OffCommand=
+ExplanationPage2X=
+ExplanationPage2Y=
+ExplanationPage2OnCommand=hidden,1
+ExplanationPage2OffCommand=
+MorePage1X=
+MorePage1Y=
+MorePage1OnCommand=hidden,1
+MorePage1OffCommand=
+MorePage2X=
+MorePage2Y=
+MorePage2OnCommand=hidden,1
+MorePage2OffCommand=
+ExtraSleepAfterTweenOffSeconds=0
+IdleCommentSeconds=15
+IdleTimeoutSeconds=0

 [ScreenUnlock]
 Class=ScreenUnlock
@@ -3415,8 +3437,9 @@ LogoOnCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomy,0;sleep,0.5;bounceend,0.
 NextScreen=ScreenHowToPlay

 [ScreenHowToPlay]
-NextScreen=ScreenDemonstration
 Class=ScreenHowToPlay
+Fallback=ScreenAttract
+NextScreen=ScreenDemonstration
 SecondsToShow=25
 UseLifeMeterBar=1
 LifeMeterBarX=SCREEN_CENTER_X+160