From 3ead35ed80e927268817d87c2be2c61ec7cae964 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 4 Dec 2004 21:22:39 +0000 Subject: [PATCH] remove ScreenCaution code, use ScreenSelectMaster instead add missing metrics and elements --- .../default/Sounds/ScreenCaution change.redir | 1 + .../default/Sounds/ScreenCaution start.redir | 1 + stepmania/Themes/default/metrics.ini | 118 +++++++++++------- 3 files changed, 77 insertions(+), 43 deletions(-) create mode 100644 stepmania/Themes/default/Sounds/ScreenCaution change.redir create mode 100644 stepmania/Themes/default/Sounds/ScreenCaution start.redir diff --git a/stepmania/Themes/default/Sounds/ScreenCaution change.redir b/stepmania/Themes/default/Sounds/ScreenCaution change.redir new file mode 100644 index 0000000000..e8a638a791 --- /dev/null +++ b/stepmania/Themes/default/Sounds/ScreenCaution change.redir @@ -0,0 +1 @@ +_silent diff --git a/stepmania/Themes/default/Sounds/ScreenCaution start.redir b/stepmania/Themes/default/Sounds/ScreenCaution start.redir new file mode 100644 index 0000000000..e8a638a791 --- /dev/null +++ b/stepmania/Themes/default/Sounds/ScreenCaution start.redir @@ -0,0 +1 @@ +_silent diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 1f033475bb..7c2829fbd7 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -78,7 +78,56 @@ SecondsBetweenComments=12 SecondsBeforeAttract=30 [ScreenCaution] -NextScreen=ScreenSelectStyle +Class=ScreenSelectMaster +ChoiceNames=1 +Choice1=screen,ScreenSelectStyle +NumCodes=0 +DefaultChoice=1 +SharedPreviewAndCursor=0 +NumCursorParts=0 +NumIconParts=0 +NumPreviewParts=0 +ShowScroller=0 +OptionOrderUp=1 +OptionOrderDown=1 +OptionOrderLeft=1 +OptionOrderRight=1 +OptionOrderAuto=1 +NumChoicesOnPage1=1 +HeaderX= +HeaderY= +HeaderOnCommand=hidden,0 +HeaderOffCommand= +FooterX= +FooterY= +FooterOnCommand=hidden,0 +FooterOffCommand= +StyleIcon=0 +MemoryCardIcons=0 +TimerSeconds=5 +TimerStealth=1 +TimerX= +TimerY= +TimerOnCommand=hidden,1 +TimerOffCommand= +HelpX= +HelpY= +HelpOnCommand=hidden,1 +HelpOffCommand= +HelpText= +ExplanationPage1X= +ExplanationPage1Y= +ExplanationPage1OnCommand=hidden,1 +ExplanationPage1OffCommand= +MorePage1X= +MorePage1Y= +MorePage1OnCommand=hidden,1 +MorePage1OffCommand= +MorePage2X= +MorePage2Y= +MorePage2OnCommand=hidden,1 +MorePage2OffCommand= +ExtraSleepAfterTweenOffSeconds=0 [ScreenEz2SelectPlayer] JoinFrameP1X=SCREEN_CENTER_X-200 @@ -90,6 +139,7 @@ JoinMessageP1Y=SCREEN_CENTER_Y+96 JoinMessageP2X=SCREEN_CENTER_X+200 JoinMessageP2Y=SCREEN_CENTER_Y+96 TimerSeconds=40 +TimerStealth=0 StyleIcon=1 MemoryCardIcons=1 NextScreen=ScreenSelectGroup @@ -108,6 +158,7 @@ Choice4=Style,double;name,double Choice5=Style,solo;name,solo NumCodes=0 TimerSeconds=40 +TimerStealth=0 StyleIcon=1 MemoryCardIcons=1 NextScreen1=ScreenSelectDifficulty @@ -172,48 +223,6 @@ PictureY=SCREEN_CENTER_Y+20 PictureOnCommand=diffusealpha,0;glow,1,1,1,0;linear,0.2;glow,1,1,1,1;linear,0.0;diffusealpha,1;linear,0.2;glow,1,1,1,0 PictureOffCommand=linear,0.5;diffusealpha,0;glow,1,1,1,0 -[ScreenSelectStyle5th] -TimerSeconds=40 -StyleIcon=1 -MemoryCardIcons=1 -NextScreen=ScreenSelectDifficulty -PadX1=70 -PadY1=300 -PadZoom1=1 -PadX2=195 -PadY2=210 -PadZoom2=1 -PadX3=300 -PadY3=310 -PadZoom3=1 -PadX4=445 -PadY4=210 -PadZoom4=1 -PadX5=570 -PadY5=300 -PadZoom5=1 -DancerX1=70 -DancerY1=300 -DancerZoom1=2 -DancerX2=160 -DancerY2=230 -DancerZoom2=2 -DancerX3=230 -DancerY3=190 -DancerZoom3=2 -DancerX4=300 -DancerY4=310 -DancerZoom4=2 -DancerX5=410 -DancerY5=230 -DancerZoom5=2 -DancerX6=460 -DancerY6=190 -DancerZoom6=2 -DancerX7=570 -DancerY7=300 -DancerZoom7=2 - [ScreenSelectMode] JoinFrameP1X=SCREEN_CENTER_X-200 JoinFrameP1Y=SCREEN_CENTER_Y+110 @@ -226,6 +235,7 @@ JoinMessageP2Y=SCREEN_CENTER_Y+96 GuideX=SCREEN_CENTER_X+0 GuideY=SCREEN_CENTER_Y+134 TimerSeconds=30 +TimerStealth=0 StyleIcon=1 MemoryCardIcons=1 NextScreen=ScreenSelectGroup @@ -254,6 +264,7 @@ NextScreen=ScreenSelectGroup StyleIcon=0 MemoryCardIcons=0 TimerSeconds=0 +TimerStealth=0 [ScreenSelectDifficulty] Fallback=ScreenWithMenuElements @@ -269,6 +280,7 @@ Choice8=PlayMode,rave;name,rave NumCodes=0 NumChoicesOnPage1=4 TimerSeconds=40 +TimerStealth=0 StyleIcon=1 MemoryCardIcons=1 NextScreen1=ScreenSelectGroup @@ -417,6 +429,7 @@ MusicListOnCommand= MusicListOffCommand= SleepAfterTweenOffSeconds=0.8 TimerSeconds=40 +TimerStealth=0 StyleIcon=1 MemoryCardIcons=1 @@ -449,6 +462,7 @@ Fallback=ScreenWithMenuElements NextScreen=ScreenSelectCharacter PrevScreen=ScreenTitleMenu TimerSeconds=15 +TimerStealth=0 StyleIcon=1 MemoryCardIcons=1 @@ -645,6 +659,7 @@ CourseContentsOffCommand=zoomy,1;bouncebegin,0.3;zoomy,0 CourseContentsShowCommand=bouncebegin,0.3;zoomy,1 CourseContentsHideCommand=linear,0.3;zoomy,0 TimerSeconds=60 +TimerStealth=0 StyleIcon=1 MemoryCardIcons=1 SampleMusicDelay=0.25 @@ -880,6 +895,7 @@ NumGroupsShow=3 StyleIcon= MemoryCardIcons= TimerSeconds= +TimerStealth=0 HelpText= PrevScreen=ScreenTitleMenu NextScreen=ScreenStage @@ -941,6 +957,7 @@ PrevScreen=ScreenTitleMenu NextScreen=ScreenBranchGameplay NextOptionsScreen=ScreenBranchFirstOptions TimerSeconds=60 +TimerStealth=0 StyleIcon=0 MemoryCardIcons=0 @@ -1519,6 +1536,7 @@ ShowMaxCombo=1 ShowScoreArea=1 ShowTimeArea=0 TimerSeconds=15 +TimerStealth=0 PlayerNameP1X= PlayerNameP1Y= PlayerNameP1OnCommand=hidden,1 @@ -1695,6 +1713,7 @@ ShowMaxCombo=1 ShowScoreArea=1 ShowTimeArea=0 TimerSeconds=30 +TimerStealth=0 SmallBanner1X=SCREEN_CENTER_X-60 SmallBanner1Y=SCREEN_CENTER_Y-160 SmallBanner1OnCommand=zoom,0.5;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT @@ -1867,6 +1886,7 @@ ShowMaxCombo=0 ShowScoreArea=1 ShowTimeArea=0 TimerSeconds=30 +TimerStealth=0 LargeBannerX=SCREEN_CENTER_X+0 LargeBannerY=SCREEN_CENTER_Y-140 LargeBannerOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT @@ -1946,6 +1966,7 @@ ShowMaxCombo=0 ShowScoreArea=0 ShowTimeArea=1 TimerSeconds=30 +TimerStealth=0 LargeBannerX=SCREEN_CENTER_X+0 LargeBannerY=SCREEN_CENTER_Y-140 LargeBannerOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT @@ -2024,6 +2045,7 @@ ShowMaxCombo=0 ShowScoreArea=0 ShowTimeArea=1 TimerSeconds=30 +TimerStealth=0 LargeBannerX=SCREEN_CENTER_X+0 LargeBannerY=SCREEN_CENTER_Y-140 LargeBannerOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT @@ -2114,6 +2136,7 @@ ShowMaxCombo=0 ShowScoreArea=1 ShowTimeArea=0 TimerSeconds=15 +TimerStealth=0 FailedSoundTime=0 PassedSoundTime=0 NumSequenceSounds=0 @@ -2215,6 +2238,7 @@ ExplanationOnCommand=wrapwidthpixels,900;zoom,0.7 StyleIcon=0 MemoryCardIcons=0 TimerSeconds=0 +TimerStealth=0 [ScreenJukeboxMenu] NextScreen=ScreenJukebox @@ -2225,6 +2249,7 @@ ExplanationOnCommand=wrapwidthpixels,900;zoom,0.7 StyleIcon=0 MemoryCardIcons=0 TimerSeconds=0 +TimerStealth=0 Fallback=ScreenWithMenuElements [ScreenEditCoursesMenu] @@ -2235,6 +2260,7 @@ ExplanationOnCommand=wrapwidthpixels,900;zoom,0.7 StyleIcon=0 MemoryCardIcons=0 TimerSeconds=0 +TimerStealth=0 [ScreenSystemLayer] StatsX=SCREEN_RIGHT-8 @@ -2397,6 +2423,7 @@ WarningCommand0=stoptweening;stopeffect;linear,0.2;zoomx,1 [ScreenOptions] Fallback=ScreenWithMenuElements +TimerStealth=0 IconsP1X=SCREEN_CENTER_X-280 IconsP2X=SCREEN_CENTER_X+280 ArrowsX=SCREEN_CENTER_X-232 @@ -2529,6 +2556,7 @@ CanDL=1 StyleIcon= MemoryCardIcons= TimerSeconds= +TimerStealth=0 HelpText= PrevScreen=ScreenTitleMenu NextScreen=ScreenStage @@ -2858,6 +2886,7 @@ AttackDurationSeconds=10 [ScreenSelectMaster] TimerSeconds=20 +TimerStealth=0 StyleIcon=1 MemoryCardIcons=1 @@ -3239,6 +3268,8 @@ PadOnCommand=Zoom,15;RotationY,180;sleep,4.7;linear,1.0;RotationY,360;Zoom,20;Ad UseNotefield=1 Stepfile=ScreenHowToPlay steps.sm PlayerX=SCREEN_CENTER_X+160 +PlayerY=SCREEN_CENTER_Y +PlayerOnCommand= SongBPM=100 NumPerfects=4 NumMisses=6 @@ -3630,6 +3661,7 @@ IconsP2OnCommand=addx,SCREEN_WIDTH*0.6;bounceend,0.5;addx,-SCREEN_WIDTH*0.6 IconsP2OffCommand=sleep,0.2;bouncebegin,0.5;addx,SCREEN_WIDTH*0.6 SleepAfterTweenOffSeconds=0.8 TimerSeconds=40 +TimerStealth=0 StyleIcon=1 MemoryCardIcons=1 PrevScreen=ScreenTitleMenu