Cleanup of theme element names

Renamed ScreenSelectMax* back to their old names Replaced all hard-coded transitions with TransitionBGAnimations
2003-03-09 00:55:49 +00:00
parent 86b0b1e7d7
commit 31aa613295
207 changed files with 1529 additions and 2246 deletions
@@ -0,0 +1 @@
+_fade in with sound
@@ -0,0 +1 @@
+_fade out with sound
@@ -0,0 +1 @@
+_options to options
@@ -0,0 +1 @@
+_options to options
@@ -0,0 +1 @@
+_shared background
@@ -0,0 +1 @@
+_fade in
@@ -0,0 +1 @@
+_menu in
@@ -0,0 +1 @@
+_menu out
@@ -0,0 +1 @@
+_fade in
@@ -0,0 +1 @@
+_menu in
@@ -0,0 +1 @@
+_menu out
@@ -0,0 +1 @@
+_menu in
@@ -0,0 +1 @@
+_fade out
@@ -0,0 +1 @@
+_menu out
@@ -0,0 +1 @@
+_fade in
@@ -0,0 +1 @@
+_fade out
@@ -0,0 +1 @@
+normal
@@ -0,0 +1 @@
+_shared menu header.png
@@ -0,0 +1 @@
+_shared menu header.png
@@ -0,0 +1 @@
+_shared options header.png
@@ -0,0 +1 @@
+_shared options header.png
@@ -0,0 +1 @@
+_shared options header.png
@@ -0,0 +1 @@
+_silent.mp3
@@ -0,0 +1 @@
+_silent.mp3
@@ -0,0 +1 @@
+_common menu music.ogg
@@ -0,0 +1 @@
+_silent.mp3
@@ -0,0 +1 @@
+_silent.mp3
@@ -0,0 +1 @@
+_common menu music.ogg
@@ -0,0 +1 @@
+_common menu music.ogg
@@ -0,0 +1 @@
+MusicWheel locked.mp3
@@ -0,0 +1 @@
+_common menu music.ogg
@@ -0,0 +1 @@
+_silent.mp3
@@ -1,15 +1,17 @@
-// Possible NextScreen names:
+// Possible NextScreen names:
 // - ScreenCaution
 // - ScreenEz2SelectPlayer
 // - ScreenSelectMode
 // - ScreenInstructions
 // - ScreenSelectCourse
-// - ScreenSelectMaxType2
-// - ScreenSelectMaxType2EX
+// - ScreenSelectStyle
+// - ScreenSelectStyle5th
+// - ScreenSelectDifficulty
+// - ScreenSelectDifficultyEX
 // - ScreenSelectGroup
 // - ScreenSelectMusic
-// - ScreenSelectMaxType15th
-// - ScreenSelectMaxType1
+// - ScreenSelectStyle5th
+// - ScreenSelectStyle

 [Common]
 ColorP1=0.4,1.0,0.8,1		// sea green
@@ -31,15 +33,14 @@ ColorSelected=0.5,1,0.5,1
 ZoomNotSelected=1.0
 ZoomSelected=1.3
 SecondsBetweenComments=12
-SecondsBetweenJointPremiumScroll=15
 SecondsBeforeAttract=30
 HelpTextHome=Use &UP; &DOWN; to select, then press START
-HelpTextPay=Insert coins, then press START
-HelpTextFree=No charge to join in.  Press START
+HelpTextPay=Press START to join in.
+HelpTextFree=Press START to join in.
 NextScreen=ScreenCaution

 [ScreenCaution]
-NextScreen=ScreenSelectMaxType1
+NextScreen=ScreenSelectStyle

 [ScreenEz2SelectPlayer]
 JoinFrameP1X=120
@@ -57,12 +58,15 @@ SilentWait=1
 BounceJoinMessage=1
 FoldOnJoin=1

-[ScreenSelectMaxType1]
-ChoicesType=0	// 0=styles, 1=difficulties, 2=modes, 3=games
+[ScreenSelectStyle]
+Choices=single,versus,couple,double,solo
 HelpText=Use &LEFT; &RIGHT; to select, then press START
 TimerSeconds=40
-NextScreen=ScreenSelectMaxType2EX
-//NextScreen=ScreenSelectMaxType2
+NextScreen1=ScreenSelectDifficulty
+NextScreen2=ScreenSelectDifficulty
+NextScreen3=ScreenSelectDifficulty
+NextScreen4=ScreenSelectDifficulty
+NextScreen5=ScreenSelectDifficulty
 JointPremiumOnCommand=x,550;y,400;xoffset,400;bounceend,0.5;xoffset,-400
 JointPremiumOffCommand=bouncebegin,0.5;xoffset,400
 Icon1OnCommand=x,60;y,84;xoffset,-800;sleep,0.20;decelerate,0.4;xoffset,800
@@ -75,18 +79,22 @@ Icon4OnCommand=x,300;y,84;xoffset,-800;sleep,0.05;decelerate,0.4;xoffset,800
 Icon4OffCommand=bouncebegin,0.5;zoomy,0
 Icon5OnCommand=x,380;y,84;xoffset,-800;sleep,0.00;decelerate,0.4;xoffset,800
 Icon5OffCommand=bouncebegin,0.5;zoomy,0
+IconGainFocusCommand=glowshift;effectperiod,0.5
+IconLoseFocusCommand=stopeffect
 DisabledColor=0.2,0.2,0.2,1
 ExplanationOnCommand=x,480;y,170;xoffset,400;bounceend,0.5;xoffset,-400
 ExplanationOffCommand=bouncebegin,0.5;xoffset,400
+WarningOnCommand=x,480;y,280;zoomy,0;decelerate,0.5;zoomy,1;y,400;diffuseshift;effectcolor1,1,1,1,1;effectcolor2,0,0,0,1
+WarningOffCommand=accelerate,0.3;zoomy,0;y,280
 InfoOnCommand=x,480;y,280;zoomy,0;bounceend,0.5;zoomy,1
 InfoOffCommand=bouncebegin,0.5;zoomy,0
-PreviewOnCommand=x,160;y,260;diffuse,1,1,1,0;glow,1,1,1,0;linear,0.2;glow,1,1,1,1;linear,0.0;diffuse,1,1,1,1;linear,0.2;glow,1,1,1,0
-PreviewOffCommand=linear,0.5;diffuse,1,1,1,0
+PictureOnCommand=x,160;y,260;diffuse,1,1,1,0;glow,1,1,1,0;linear,0.2;glow,1,1,1,1;linear,0.0;diffuse,1,1,1,1;linear,0.2;glow,1,1,1,0
+PictureOffCommand=linear,0.5;diffuse,1,1,1,0

-[ScreenSelectMaxType15th]
+[ScreenSelectStyle5th]
 HelpText=Use &LEFT; &RIGHT; to select, then press START
 TimerSeconds=40
-NextScreen=ScreenSelectMaxType2
+NextScreen=ScreenSelectDifficulty

 [ScreenSelectMode]
 JoinFrameP1X=120
@@ -112,14 +120,17 @@ FoldOnJoin=1
 [ScreenStyleSplash]
 NextScreen=ScreenSelectGroup

-[ScreenSelectMaxType2]
-ChoicesType=1	// 0=styles, 1=difficulties, 2=modes, 3=games
-Choices=Beginner,Easy,Medium,Hard,Nonstop,Oni,Endless
+[ScreenSelectDifficulty]
+Choices=arcade-beginner,arcade-easy,arcade-medium,arcade-hard,nonstop,oni,endless
 HelpText=Use &LEFT; &RIGHT; to select, then press START
 TimerSeconds=40
-NextScreenArcade=ScreenSelectGroup
-NextScreenOni=ScreenInstructions
-NextScreenBattle=ScreenInstructions
+NextScreen1=ScreenSelectGroup
+NextScreen2=ScreenSelectGroup
+NextScreen3=ScreenSelectGroup
+NextScreen4=ScreenSelectGroup
+NextScreen5=ScreenSelectGroup
+NextScreen6=ScreenSelectGroup
+NextScreen7=ScreenSelectGroup
 NumChoicesOnPage1=4
 LockInputSeconds=0.5
 SleepAfterChoiceSeconds=0.5
@@ -132,20 +143,20 @@ ExplanationPage1OnCommand=x,170;y,70;xoffset,-400;bounceend,0.5;xoffset,400;
 ExplanationPage1OffCommand=bouncebegin,0.5;xoffset,-400
 ExplanationPage2OnCommand=x,1100;y,70
 ExplanationPage2OffCommand=bouncebegin,0.5;xoffset,400
-HeaderPage1Choice1OnCommand=vertalign,bottom;x,90;y,180;xoffset,-800;sleep,0.0;decelerate,0.4;xoffset,800
-HeaderPage1Choice1OffCommand=sleep,0.3;accelerate,0.4;xoffset,-800
-HeaderPage1Choice2OnCommand=vertalign,bottom;x,246;y,220;xoffset,-800;sleep,0.2;decelerate,0.4;xoffset,800
-HeaderPage1Choice2OffCommand=sleep,0.5;accelerate,0.4;xoffset,-800
-HeaderPage1Choice3OnCommand=vertalign,bottom;x,394;y,180;xoffset,-800;sleep,0.4;decelerate,0.4;xoffset,800
-HeaderPage1Choice3OffCommand=sleep,0.7;accelerate,0.4;xoffset,-800
-HeaderPage1Choice4OnCommand=vertalign,bottom;x,542;y,220;xoffset,-800;sleep,0.6;decelerate,0.4;xoffset,800
-HeaderPage1Choice4OffCommand=sleep,0.9;accelerate,0.4;xoffset,-800
-HeaderPage2Choice1OnCommand=vertalign,bottom;x,760;y,200
-HeaderPage2Choice1OffCommand=sleep,0.3;accelerate,0.4;xoffset,-800
-HeaderPage2Choice2OnCommand=vertalign,bottom;x,960;y,200
-HeaderPage2Choice2OffCommand=sleep,0.5;accelerate,0.4;xoffset,-800
-HeaderPage2Choice3OnCommand=vertalign,bottom;x,1160;y,200
-HeaderPage2Choice3OffCommand=sleep,0.7;accelerate,0.4;xoffset,-800
+InfoPage1Choice1OnCommand=vertalign,bottom;x,90;y,180;xoffset,-800;sleep,0.0;decelerate,0.4;xoffset,800
+InfoPage1Choice1OffCommand=sleep,0.3;accelerate,0.4;xoffset,-800
+InfoPage1Choice2OnCommand=vertalign,bottom;x,246;y,220;xoffset,-800;sleep,0.2;decelerate,0.4;xoffset,800
+InfoPage1Choice2OffCommand=sleep,0.5;accelerate,0.4;xoffset,-800
+InfoPage1Choice3OnCommand=vertalign,bottom;x,394;y,180;xoffset,-800;sleep,0.4;decelerate,0.4;xoffset,800
+InfoPage1Choice3OffCommand=sleep,0.7;accelerate,0.4;xoffset,-800
+InfoPage1Choice4OnCommand=vertalign,bottom;x,542;y,220;xoffset,-800;sleep,0.6;decelerate,0.4;xoffset,800
+InfoPage1Choice4OffCommand=sleep,0.9;accelerate,0.4;xoffset,-800
+InfoPage2Choice1OnCommand=vertalign,bottom;x,760;y,200
+InfoPage2Choice1OffCommand=sleep,0.3;accelerate,0.4;xoffset,-800
+InfoPage2Choice2OnCommand=vertalign,bottom;x,960;y,200
+InfoPage2Choice2OffCommand=sleep,0.5;accelerate,0.4;xoffset,-800
+InfoPage2Choice3OnCommand=vertalign,bottom;x,1160;y,200
+InfoPage2Choice3OffCommand=sleep,0.7;accelerate,0.4;xoffset,-800
 PicturePage1Choice1OnCommand=vertalign,top;x,90;y,180;zoomy,0.0;sleep,0.4;bounceend,0.3;zoomy,1
 PicturePage1Choice1OffCommand=sleep,0.0;bouncebegin,0.3;zoomy,0
 PicturePage1Choice2OnCommand=vertalign,top;x,246;y,220;zoomy,0.0;sleep,0.6;bounceend,0.3;zoomy,1
@@ -177,7 +188,7 @@ OKChooseCommand=diffuse,1,1,1,1;zoom,2;linear,0.2;diffuse,1,1,1,1;zoom,1
 OKOffCommand=sleep,0.2;linear,0.3;zoom,0
 DisabledColor=0.2,0.2,0.2,1

-[ScreenSelectMaxType2EX]
+[ScreenSelectMaxScreenSelectDifficultyEX]
 DifficultyP1X=216
 DifficultyP1Y=180
 DifficultyP2X=440
@@ -591,19 +602,16 @@ StopMusicOnNext=0
 KeepAliveType=0		// 0 for MAX, 1 for 5th

 [MenuElements]
-TopEdgeX=320
-TopEdgeY=22
-BottomEdgeX=320
-BottomEdgeY=464
-HelpX=320
-HelpY=456
-StyleIconX=440
-StyleIconY=28
-TimerX=590
-TimerY=22
-
-[HoldJudgement]
-DisplayTime=0.6
+HeaderOnCommand=x,320;y,22;xoffset,640;spring,0.5;xoffset,-640
+HeaderOffCommand=bouncebegin,0.5;xoffset,640;
+FooterOnCommand=x,320;y,464
+FooterOffCommand=
+HelpOnCommand=x,320;y,456;zoom,0.5;zoomy,0;linear,0.5;zoomy,0.5
+HelpOffCommand=linear,0.5;zoomy,0
+StyleIconOnCommand=x,460;y,22;xoffset,640;spring,0.5;xoffset,-640
+StyleIconOffCommand=bouncebegin,0.5;xoffset,640;
+TimerOnCommand=x,588;y,22;xoffset,640;spring,0.5;xoffset,-640
+TimerOffCommand=bouncebegin,0.5;xoffset,640;

 [ScreenOptions]
 IconsP1X=40
@@ -622,25 +630,9 @@ ExplanationY=412
 ExplanationZoom=0.5
 ColorSelected=1,1,1,1		// normal
 ColorNotSelected=0.5,0.5,0.5,1	// grayed
-HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options      then press START
-TimerSeconds=40
-
-[ScreenPreferences]
-LabelsX=140
-LabelsZoom=0.7
-LabelsHAlign=2	// 0,1,2 = left,center,right
-ItemsZoom=0.5
-ItemsX=160
-ItemsStartY=88
-ItemsSpacingY=34
-ColorSelected=1,1,1,1			// normal
-ColorNotSelected=0.5,0.5,0.5,1		// grayed
-ColorSelectedDefault=0.2,1.0,0.2,1	// green
-ColorNotSelectedDefault=0.1,0.5,0.1,1	// grayed green
-HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options      then press START

 [ScreenMapControllers]
-HelpText=Use arrow keys to navigate, ENTER to assign, SPACE to clear, ESCAPE when done.::Some USB adaptors require that you chage "Ignore Joy Axes" in the Input Options screen.
+HelpText=Use arrow keys to navigate, ENTER to assign, SPACE to clear, ESCAPE when done.::Some USB adaptors require that you change "Ignore Joy Axes" in the Input Options screen.

 [GhostArrow]
 ShowSeconds=0.12
@@ -697,15 +689,13 @@ RightEdge=620
 BottomEdge=460

 [Judgment]
-WordX=0
-WordY=0
-MarvelousZoom=1.3
-PerfectZoom=1.2
-GreatZoom=1.1
-GoodZoom=1.05
-BooZoom=1.0
-TweenSeconds=0.05
-ShowSeconds=0.8
+MarvelousCommand=shadowlength,4;diffuse,1,1,1,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0;diffuse,1,1,1,0,glowblink,effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.5
+PerfectCommand=shadowlength,4;diffuse,1,1,1,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0;diffuse,1,1,1,0
+GreatCommand=shadowlength,4;diffuse,1,1,1,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.8;linear,0;diffuse,1,1,1,0
+GoodCommand=shadowlength,4;diffuse,1,1,1,1;zoom,1.1;linear,0.05;zoom,1;sleep,0.8;linear,0;diffuse,1,1,1,0
+BooCommand=shadowlength,4;diffuse,1,1,1,1;zoom,1.0;vibrate;effectmagnitude,4,8,8;sleep,0.8;linear,0;diffuse,1,1,1,0
+MissCommand=shadowlength,4;diffuse,1,1,1,1;zoom,1;y,-20;linear,0.8;y,20;sleep,0.8;linear,0;diffuse,1,1,1,0
+

 [Combo]
 LabelX=6
@@ -724,10 +714,8 @@ PulseZoom=1.2
 TweenSeconds=0.05

 [HoldJudgment]
-OKZoomX=1.25
-OKZoomY=1.25
-TweenSeconds=0.3
-ShowSeconds=0.8
+NGCommand=shadowlength,4;diffuse,1,1,1,1;zoom,1;y,-10;linear,0.8;y,10
+OKCommand=shadowlength,4;diffuse,1,1,1,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0;diffuse,1,1,1,0

 [Player]
 GrayArrowsY=96
@@ -819,7 +807,8 @@ BannerWidth=564
 BannerHeight=184

 [ScreenInputOptions]
-IgnoreJoyAxes=&oq;ON&cq; will cause StepMania to ignore all input from::joystick directional pads.  This is useful for people using::the DirectPad Pro driver.
+HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options::START to accept changes   BACK to discard changes
+IgnoreJoyAxes=&oq;ON&cq; will cause StepMania to ignore all input from::joystick directional pads.  This is useful for the DirectPad Pro driver::and some brands of USB convertors.
 MenuButtons=The default setting allows the dance pad's panels to navigate::the menus.  Changing this to &oq;dedicated only&cq; will restrict::menu navigation to only the Menu* set of buttons.  Be sure to map::the Menu* set of buttons before setting this to &oq;dedicated&cq;!
 AutoPlay=This option is useful for those who would like to play::without using a pad.  However, you will not be able to set::high scores or earn extra stages while this options is ON.
 BackDelayed=Turning this option ON will require that you hold the Back button::for 0.5 seconds before it will regiser.  This is useful if you find::yourself accidentally pressing the Back button on your controller.
@@ -827,6 +816,7 @@ OptionsNavigation=When using &oq;SM style&cq;, the Start button will take::you t
 WheelSpeed=Adjusts the speed of the DDR style musicwheel.

 [ScreenMachineOptions]
+HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options::START to accept changes   BACK to discard changes
 MenuTimer=Turn this &oq;OFF&cq; to disable the time limit in menus.
 ArcadeStages=The number of songs a player can play in Arcade mode.::Set this to &oq;Unlimited&cq;, and you can continue playing forever.::Also, when this option is set to &oq;Unlimited&cq;, failing will take you::back to the the Select Music or Select Course screen.
 JudgeDifficulty=Increase this value to cause your steps to be judged more strictly::(i.e. shink the timing window).
@@ -839,6 +829,7 @@ JointPremium=When set to OFF, game styles that require both sides of the machine
 SongOptions=Choose whether or not to display the Song Options screen::after the Player Options screen.

 [ScreenGraphicOptions]
+HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options::START to accept changes   BACK to discard changes
 DisplayMode=Choose whether you would like StepMania to run full screen,::or to display in a window on your desktop.
 DisplayColor=Choose the color depth of the StepMania window.::This option may not take effect in windowed mode.
 TextureColor=Choose the color depth of textures.::32 bit texture use more memory, but look nicer.
@@ -850,6 +841,7 @@ WaitForVsync=Wait for the monitor's vertical retrace before displaying::the next
 KeepTexturesInMemory=Set to ON hold textures in memory instead of::freeing them.  This will eliminate the time needed to load::the texture next from disk next time this is needed.  Do not set to ON::unless you have 128MB of memory or more.

 [ScreenGameplayOptions]
+HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options::START to accept changes   BACK to discard changes
 BackgroundMode=Choose what type of backgrounds you would like displayed.::&oq;Animations&cq; uses any random items in the BGAnimations folder.::&oq;Visualizations&cq; chooses a random overlay movie from the Visualization folder.::&oq;Random Movies&cq; cycles through movies in the RandomMovies folder.
 BackgroundBrightness=Controls how bright the background will appear.::Turn this setting down if you have a hard time seeing the notes.
 BGForBanner=Instead of displaying the banner image in menus, display::the song background instead.  Backgrounds can look better::than banners because they are higher resolution, but they::will take longer to load and may result in some &oq;skipping&cq;.
@@ -861,6 +853,7 @@ PickExtraStage=Instead of a set extra stage, this allows::the player to choose w
 SoloSingles=Turn this option &oq;ON&cq; to enable Solo-Style::for 4-panel single play.

 [ScreenAppearanceOptions]
+HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options::START to accept changes   BACK to discard changes
 Announcer=Choose from this list of installed annoucner packs.::For more information about creating announcer packs, see the README.
 Theme=Choose from this list of installed theme packs.::For more information about creating theme packs, see the README.
 NoteSkin=Choose from this list of installed note skins.::For more information about creating a note skin, see the README.
@@ -873,11 +866,9 @@ Translations=Choose whether to displays song titles in their native::language (
 DifficultySelect=

 [ScreenUnlock]
-SecondsToShow=10
 NextScreen=ScreenRanking

 [ScreenRanking]
-SecondsToShow=0		// ignored in favor of SecsBetweenPages below
 NextScreen=ScreenWarning
 CategoryX=520
 CategoryY=32
@@ -903,44 +894,35 @@ CoursesToShow=Courses/NaokiStandard.crs,Courses/ParanoiaBrothers.crs
 NotesTypesToHide=dance-couple,dance-solo

 [ScreenSoundOptions]
-MasterVolume=Reset the internal volume of Stepmania
+HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options::START to accept changes   BACK to discard changes
+MasterVolume=

 [ScreenIntroMovie]
-SecondsToShow=14
 NextScreen=ScreenDemonstration

 [ScreenMemoryCard]
-SecondsToShow=5
 NextScreen=ScreenWarning

 [ScreenWarning]
-SecondsToShow=5
 NextScreen=ScreenCompany

 [ScreenCompany]
-SecondsToShow=5
 NextScreen=ScreenLogo

 [ScreenAlbums]
-SecondsToShow=10
 NextScreen=ScreenLogo

 [ScreenLogo]
-LogoX=320
-LogoY=240
-VersionX=590
-VersionY=20
-SongsX=20
-SongsY=20
-SecondsToShow=10
-NextScreen=ScreenIntroMovie
+LogoOnCommand=x,320;y,240;zoomy,0;sleep,0.5;bounceend,0.5;,zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0.1;effectcolor2,1,1,1,0.3
+VersionOnCommand=horizalign,right;x,620;y,20;diffuse,0.6,0.6,0.6,1;zoom,0.5;shadowlength,2
+SongsOnCommand=horizalign,left;x,20;y,20;diffuse,0.6,0.6,0.6,1;zoom,0.5;shadowlength,2
+NextScreen=ScreenDemonstration

 [ScreenDemonstration]
 SecondsToShow=30
 NextScreen=ScreenRanking

 [ScreenHowToPlay]
-SecondsToShow=30
 NextScreen=ScreenUnlock

 [ScreenNameEntry]
@@ -1005,6 +987,7 @@ Row3Y=180
 Row4Y=230

 [ScreenOptionsMenu]
+HelpText=&UP; &DOWN; to change line   then press START
 InputOptions=
 ConfigKey/JoyMappings=
 MachineOptions=
@@ -1056,3 +1039,17 @@ TextHorizAlignP1=0
 TextHorizAlignP2=0
 TextZoom=0
 SpacingY=0
+
+[ScreenSelectGame]
+HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options::START to accept changes   BACK to discard changes
+Game=Change the current game type with this option.
+
+[ScreenPlayerOptions]
+HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options   START to accept changes
+TimerSeconds=30
+
+[ScreenSongOptions]
+HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options   START to accept changes
+Game=Change the current game type with this option.
+TimerSeconds=30
+
@@ -266,6 +266,8 @@ void Actor::BeginTweening( float time, TweenType tt )
 {
 	ASSERT( time >= 0 );

+	time = max( time, 0 );
+
 	ASSERT( m_TweenStates.size() < 50 );	// there's no reason for the number of tweens to ever go this large

 	// add a new TweenState to the tail, and initialize it
@@ -551,8 +553,7 @@ void Actor::Fade( float fSleepSeconds, CString sFadeString, float fFadeSeconds,

 void Actor::Command( CString sCommandString )
 {
-	// add a snap tween in case the user forgets to use a tween as the first command
-//	BeginTweening( 0.0001f, TWEEN_LINEAR );
+	// OPTIMIZATION OPPORTUNITY:  sCommandString could be parsed much more efficiently.

 	CStringArray asCommands;
 	split( sCommandString, ";", asCommands, true );
@@ -623,8 +624,13 @@ void Actor::Command( CString sCommandString )
 		else if( sName=="additiveblend" )	EnableAdditiveBlend( iParam(0)!=0 );
 		else
 		{
-			LOG->Warn( "Unrecognized command name '%s' in command string '%s'.", sName.GetString(), sCommandString.GetString() );
-			ASSERT(0);
+			CString sError = ssprintf( "Unrecognized command name '%s' in command string '%s'.", sName.GetString(), sCommandString.GetString() );
+			LOG->Warn( sError );
+#if defined(WIN32) // XXX arch?
+			if( DISPLAY->IsWindowed() )
+				MessageBox(NULL, sError, "Actor::Command", MB_OK);
+#endif
+
 		}
 	}
 }
@@ -29,13 +29,13 @@ BPMDisplay::BPMDisplay()
 	m_fTimeLeftInState = 0;
 	m_bExtraStage = GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2();

-	m_textBPM.LoadFromNumbers( THEME->GetPathTo("Numbers","select music bpm numbers") );
+	m_textBPM.LoadFromNumbers( THEME->GetPathTo("Numbers","BPMDisplay numbers") );
 	m_textBPM.EnableShadow( false );
 	m_textBPM.SetHorizAlign( Actor::align_right );
 	m_textBPM.SetDiffuse( NORMAL_COLOR );
 	m_textBPM.SetXY( 0, 0 );

-	m_sprLabel.Load( THEME->GetPathTo("Graphics","select music bpm label") );
+	m_sprLabel.Load( THEME->GetPathTo("Graphics","BPMDisplay label") );
 	m_sprLabel.EnableShadow( false );
 	m_sprLabel.SetDiffuse( NORMAL_COLOR );
 	m_sprLabel.SetHorizAlign( Actor::align_left );
@@ -154,7 +154,7 @@ void Background::LoadFromSong( Song* pSong )
 	const float fXZoom = RECT_BACKGROUND.GetWidth() / (float)SCREEN_WIDTH;
 	const float fYZoom = RECT_BACKGROUND.GetHeight() / (float)SCREEN_HEIGHT;

-	const CString sSongBackgroundPath = pSong->HasBackground() ? pSong->GetBackgroundPath() : THEME->GetPathTo("Graphics","fallback background");
+	const CString sSongBackgroundPath = pSong->HasBackground() ? pSong->GetBackgroundPath() : THEME->GetPathTo("Graphics","Background fallback");

 	//
 	// Load the static background that will before notes start and after notes end
@@ -76,24 +76,22 @@ void Banner::LoadFromSong( Song* pSong )		// NULL means no song
 	m_bScrolling = false;
 }

+void Banner::LoadAllMusic()
+{
+	Load( THEME->GetPathTo("Graphics","Banner all") );
+	m_bScrolling = false;
+}
+
 void Banner::LoadFromGroup( CString sGroupName )
 {
 	CString sGroupBannerPath = SONGMAN->GetGroupBannerPath( sGroupName );
-
-	if( sGroupName == GROUP_ALL_MUSIC )
-		Load( THEME->GetPathTo("Graphics","all music banner") );
-	else if( sGroupBannerPath != "" )
-		Load( sGroupBannerPath );
-	else
-		LoadFallback();
-
+	if( sGroupBannerPath != "" )	Load( sGroupBannerPath );
+	else							LoadFallback();
 	m_bScrolling = false;
 }

 void Banner::LoadFromCourse( Course* pCourse )		// NULL means no course
 {
-	Sprite::EnableShadow( false );
-
 	if( pCourse == NULL )						LoadFallback();
 	else if( pCourse->m_sBannerPath != "" )		Load( pCourse->m_sBannerPath );
 	else										LoadFallback();
@@ -103,12 +101,12 @@ void Banner::LoadFromCourse( Course* pCourse )		// NULL means no course

 void Banner::LoadFallback()
 {
-	Load( THEME->GetPathTo("Graphics","fallback banner") );
+	Load( THEME->GetPathTo("Graphics","Banner fallback") );
 }

 void Banner::LoadRoulette()
 {
-	RageTextureID ID(THEME->GetPathTo("Graphics","select music roulette banner"));
+	RageTextureID ID(THEME->GetPathTo("Graphics","Banner roulette"));
 	ID.iMipMaps = 0;
 	Load( ID );
 	m_bScrolling = true;
@@ -27,6 +27,7 @@ public:
 	virtual void Update( float fDeltaTime );

 	void LoadFromSong( Song* pSong );		// NULL means no song
+	void LoadAllMusic();
 	void LoadFromGroup( CString sGroupName );
 	void LoadFromCourse( Course* pCourse );
 	void LoadRoulette();
@@ -21,7 +21,7 @@

 BannerWithFrame::BannerWithFrame()
 {
-	m_sprBannerFrame.Load( THEME->GetPathTo("Graphics","evaluation banner frame") );
+	m_sprBannerFrame.Load( THEME->GetPathTo("Graphics","BannerWithFrame frame") );
 	m_Banner.SetCroppedSize( m_sprBannerFrame.GetUnzoomedWidth()-6, m_sprBannerFrame.GetUnzoomedHeight()-6 );

 	this->AddChild( &m_Banner );
@@ -53,7 +53,7 @@ Combo::Combo()

 	Reset();

-	m_sprCombo.Load( THEME->GetPathTo("Graphics", "gameplay combo label") );
+	m_sprCombo.Load( THEME->GetPathTo("Graphics", "Combo label") );
 	m_sprCombo.EnableShadow( true );
 	m_sprCombo.StopAnimating();
 	m_sprCombo.SetXY( LABEL_X, LABEL_Y );
@@ -61,7 +61,7 @@ Combo::Combo()
 	m_sprCombo.SetVertAlign( (Actor::VertAlign)(int)LABEL_VERT_ALIGN );
 	this->AddChild( &m_sprCombo );

-	m_textComboNumber.LoadFromNumbers( THEME->GetPathTo("Numbers","gameplay combo numbers") );
+	m_textComboNumber.LoadFromNumbers( THEME->GetPathTo("Numbers","Combo numbers") );
 	m_textComboNumber.EnableShadow( true );
 	m_textComboNumber.SetXY( NUMBER_X, NUMBER_Y );
 	m_textComboNumber.SetHorizAlign( (Actor::HorizAlign)(int)NUMBER_HORIZ_ALIGN );
@@ -95,7 +95,7 @@ void Combo::SetScore( TapNoteScore score, int iNumNotesInThisRow, Inventory* pIn
 	case TNS_PERFECT:
 		m_iCurComboOfPerfects += iNumNotesInThisRow;

-		if( rand() < 0.1f && m_iCurComboOfPerfects>=150 && (m_iCurComboOfPerfects%150)==0 && !GAMESTATE->m_bDemonstration )
+		if( rand() < 0.1f && m_iCurComboOfPerfects>=150 && (m_iCurComboOfPerfects%150)==0 && !GAMESTATE->m_bDemonstrationOrJukebox )
 			SCREENMAN->SendMessageToTopScreen( SM_BeginToasty, 0 );
 		break;
 	default:
@@ -11,7 +11,7 @@
 -----------------------------------------------------------------------------
 */

-#include "FootMeter.h"
+#include "DifficultyMeter.h"
 #include "BitmapText.h"
 #include "TextBanner.h"
 #include "ActorFrame.h"
@@ -11,12 +11,12 @@
 -----------------------------------------------------------------------------
 */

-#include "FootMeter.h"
 #include "BitmapText.h"
 #include "TextBanner.h"
 #include "ActorFrame.h"
 #include "Sprite.h"
 #include "Quad.h"
+#include "GameConstantsAndTypes.h"
 class Course;
 class Song;
 struct Notes;
--- a/Show More
+++ b/Show More