[cleanNoteData] More of the formatting.
Note to self: move some of the static menus to their own file or something.
This commit is contained in:
Jason Felds
+128
-32
@@ -882,29 +882,108 @@ static bool EnabledIfSet2GlobalMovieSongGroup();
|
||||
static bool EnabledIfSet2GlobalMovieSongGroupAndGenre();
|
||||
static MenuDef g_BackgroundChange(
|
||||
"ScreenMiniMenuBackgroundChange",
|
||||
MenuRowDef( ScreenEdit::layer, "Layer", false, EditMode_Full, true, false, 0, "" ),
|
||||
MenuRowDef( ScreenEdit::rate, "Rate", true, EditMode_Full, true, false, 10, "0%","10%","20%","30%","40%","50%","60%","70%","80%","90%","100%","120%","140%","160%","180%","200%","220%","240%","260%","280%","300%","350%","400%" ),
|
||||
MenuRowDef( ScreenEdit::transition, "Force Transition", true, EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef( ScreenEdit::effect, "Force Effect", true, EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef( ScreenEdit::color1, "Force Color 1", true, EditMode_Full, true, false, 0, "-","#FFFFFF","#808080","#FFFFFF80","#000000","#FF0000","#00FF00","#0000FF","#FFFF00","#00FFFF","#FF00FF" ),
|
||||
MenuRowDef( ScreenEdit::color2, "Force Color 2", true, EditMode_Full, true, false, 0, "-","#FFFFFF","#808080","#FFFFFF80","#000000","#FF0000","#00FF00","#0000FF","#FFFF00","#00FFFF","#FF00FF" ),
|
||||
MenuRowDef( ScreenEdit::file1_type, "File1 Type", true, EditMode_Full, true, true, 0, "Song BGAnimation", "Song Movie", "Song Bitmap", "Global BGAnimation", "Global Movie", "Global Movie from Song Group", "Global Movie from Song Group and Genre", "Dynamic Random", "Baked Random", "None" ),
|
||||
MenuRowDef( ScreenEdit::file1_song_bganimation, "File1 Song BGAnimation", EnabledIfSet1SongBGAnimation, EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef( ScreenEdit::file1_song_movie, "File1 Song Movie", EnabledIfSet1SongMovie, EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef( ScreenEdit::file1_song_still, "File1 Song Still", EnabledIfSet1SongBitmap, EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef( ScreenEdit::file1_global_bganimation, "File1 Global BGAnimation", EnabledIfSet1GlobalBGAnimation, EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef( ScreenEdit::file1_global_movie, "File1 Global Movie", EnabledIfSet1GlobalMovie, EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef( ScreenEdit::file1_global_movie_song_group, "File1 Global Movie (Group)", EnabledIfSet1GlobalMovieSongGroup, EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef( ScreenEdit::file1_global_movie_song_group_and_genre, "File1 Global Movie (Group + Genre)", EnabledIfSet1GlobalMovieSongGroupAndGenre, EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef( ScreenEdit::file2_type, "File2 Type", true, EditMode_Full, true, true, 0, "Song BGAnimation", "Song Movie", "Song Bitmap", "Global BGAnimation", "Global Movie", "Global Movie from Song Group", "Global Movie from Song Group and Genre", "Dynamic Random", "Baked Random", "None" ),
|
||||
MenuRowDef( ScreenEdit::file2_song_bganimation, "File2 Song BGAnimation", EnabledIfSet2SongBGAnimation, EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef( ScreenEdit::file2_song_movie, "File2 Song Movie", EnabledIfSet2SongMovie, EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef( ScreenEdit::file2_song_still, "File2 Song Still", EnabledIfSet2SongBitmap, EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef( ScreenEdit::file2_global_bganimation, "File2 Global BGAnimation", EnabledIfSet2GlobalBGAnimation, EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef( ScreenEdit::file2_global_movie, "File2 Global Movie", EnabledIfSet2GlobalMovie, EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef( ScreenEdit::file2_global_movie_song_group, "File2 Global Movie (Group)", EnabledIfSet2GlobalMovieSongGroup, EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef( ScreenEdit::file2_global_movie_song_group_and_genre, "File2 Global Movie (Group + Genre)", EnabledIfSet2GlobalMovieSongGroupAndGenre, EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef( ScreenEdit::delete_change, "Remove Change", true, EditMode_Full, true, true, 0, NULL )
|
||||
MenuRowDef(ScreenEdit::layer,
|
||||
"Layer",
|
||||
false,
|
||||
EditMode_Full, true, false, 0, "" ),
|
||||
MenuRowDef(ScreenEdit::rate,
|
||||
"Rate",
|
||||
true,
|
||||
EditMode_Full, true, false, 10, "0%","10%","20%","30%","40%","50%",
|
||||
"60%","70%","80%","90%","100%","120%","140%","160%","180%","200%",
|
||||
"220%","240%","260%","280%","300%","350%","400%" ),
|
||||
MenuRowDef(ScreenEdit::transition,
|
||||
"Force Transition",
|
||||
true,
|
||||
EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef(ScreenEdit::effect,
|
||||
"Force Effect",
|
||||
true,
|
||||
EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef(ScreenEdit::color1,
|
||||
"Force Color 1",
|
||||
true,
|
||||
EditMode_Full, true, false, 0, "-","#FFFFFF","#808080","#FFFFFF80",
|
||||
"#000000","#FF0000","#00FF00","#0000FF","#FFFF00","#00FFFF","#FF00FF" ),
|
||||
MenuRowDef(ScreenEdit::color2,
|
||||
"Force Color 2",
|
||||
true,
|
||||
EditMode_Full, true, false, 0, "-","#FFFFFF","#808080","#FFFFFF80",
|
||||
"#000000","#FF0000","#00FF00","#0000FF","#FFFF00","#00FFFF","#FF00FF" ),
|
||||
MenuRowDef(ScreenEdit::file1_type,
|
||||
"File1 Type",
|
||||
true,
|
||||
EditMode_Full, true, true, 0, "Song BGAnimation", "Song Movie",
|
||||
"Song Bitmap", "Global BGAnimation", "Global Movie",
|
||||
"Global Movie from Song Group", "Global Movie from Song Group and Genre",
|
||||
"Dynamic Random", "Baked Random", "None" ),
|
||||
MenuRowDef(ScreenEdit::file1_song_bganimation,
|
||||
"File1 Song BGAnimation",
|
||||
EnabledIfSet1SongBGAnimation,
|
||||
EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef(ScreenEdit::file1_song_movie,
|
||||
"File1 Song Movie",
|
||||
EnabledIfSet1SongMovie,
|
||||
EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef(ScreenEdit::file1_song_still,
|
||||
"File1 Song Still",
|
||||
EnabledIfSet1SongBitmap,
|
||||
EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef(ScreenEdit::file1_global_bganimation,
|
||||
"File1 Global BGAnimation",
|
||||
EnabledIfSet1GlobalBGAnimation,
|
||||
EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef(ScreenEdit::file1_global_movie,
|
||||
"File1 Global Movie",
|
||||
EnabledIfSet1GlobalMovie,
|
||||
EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef(ScreenEdit::file1_global_movie_song_group,
|
||||
"File1 Global Movie (Group)",
|
||||
EnabledIfSet1GlobalMovieSongGroup,
|
||||
EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef(ScreenEdit::file1_global_movie_song_group_and_genre,
|
||||
"File1 Global Movie (Group + Genre)",
|
||||
EnabledIfSet1GlobalMovieSongGroupAndGenre,
|
||||
EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef(ScreenEdit::file2_type,
|
||||
"File2 Type",
|
||||
true,
|
||||
EditMode_Full, true, true, 0, "Song BGAnimation", "Song Movie",
|
||||
"Song Bitmap", "Global BGAnimation", "Global Movie",
|
||||
"Global Movie from Song Group", "Global Movie from Song Group and Genre",
|
||||
"Dynamic Random", "Baked Random", "None" ),
|
||||
MenuRowDef(ScreenEdit::file2_song_bganimation,
|
||||
"File2 Song BGAnimation",
|
||||
EnabledIfSet2SongBGAnimation,
|
||||
EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef(ScreenEdit::file2_song_movie,
|
||||
"File2 Song Movie",
|
||||
EnabledIfSet2SongMovie,
|
||||
EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef(ScreenEdit::file2_song_still,
|
||||
"File2 Song Still",
|
||||
EnabledIfSet2SongBitmap,
|
||||
EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef(ScreenEdit::file2_global_bganimation,
|
||||
"File2 Global BGAnimation",
|
||||
EnabledIfSet2GlobalBGAnimation,
|
||||
EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef(ScreenEdit::file2_global_movie,
|
||||
"File2 Global Movie",
|
||||
EnabledIfSet2GlobalMovie,
|
||||
EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef(ScreenEdit::file2_global_movie_song_group,
|
||||
"File2 Global Movie (Group)",
|
||||
EnabledIfSet2GlobalMovieSongGroup,
|
||||
EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef(ScreenEdit::file2_global_movie_song_group_and_genre,
|
||||
"File2 Global Movie (Group + Genre)",
|
||||
EnabledIfSet2GlobalMovieSongGroupAndGenre,
|
||||
EditMode_Full, true, false, 0, NULL ),
|
||||
MenuRowDef(ScreenEdit::delete_change,
|
||||
"Remove Change",
|
||||
true,
|
||||
EditMode_Full, true, true, 0, NULL )
|
||||
);
|
||||
static bool EnabledIfSet1SongBGAnimation() { return ScreenMiniMenu::s_viLastAnswers[ScreenEdit::file1_type] == song_bganimation && !g_BackgroundChange.rows[ScreenEdit::file1_song_bganimation].choices.empty(); }
|
||||
static bool EnabledIfSet1SongMovie() { return ScreenMiniMenu::s_viLastAnswers[ScreenEdit::file1_type] == song_movie && !g_BackgroundChange.rows[ScreenEdit::file1_song_movie].choices.empty(); }
|
||||
@@ -939,21 +1018,38 @@ static RString GetOneBakedRandomFile( Song *pSong, bool bTryGenre = true )
|
||||
|
||||
static MenuDef g_InsertTapAttack(
|
||||
"ScreenMiniMenuInsertTapAttack",
|
||||
MenuRowDef( -1, "Duration seconds", true, EditMode_Practice, true, false, 3, "5","10","15","20","25","30","35","40","45" ),
|
||||
MenuRowDef( -1, "Set modifiers", true, EditMode_Practice, true, true, 0, "Press Start" )
|
||||
MenuRowDef(-1,
|
||||
"Duration seconds",
|
||||
true, EditMode_Practice, true, false, 3, "5","10","15","20","25","30","35","40","45" ), // TODO: Replace
|
||||
MenuRowDef(-1,
|
||||
"Set modifiers",
|
||||
true, EditMode_Practice, true, true, 0, "Press Start" )
|
||||
);
|
||||
|
||||
static MenuDef g_InsertCourseAttack(
|
||||
"ScreenMiniMenuInsertCourseAttack",
|
||||
MenuRowDef( ScreenEdit::duration, "Duration seconds", true, EditMode_Practice, true, false, 3, "5","10","15","20","25","30","35","40","45" ),
|
||||
MenuRowDef( ScreenEdit::set_mods, "Set modifiers", true, EditMode_Practice, true, true, 0, "Press Start" ),
|
||||
MenuRowDef( ScreenEdit::remove, "Remove", true, EditMode_Practice, true, true, 0, "Press Start" )
|
||||
MenuRowDef(ScreenEdit::duration,
|
||||
"Duration seconds",
|
||||
true, EditMode_Practice, true, false, 3, "5","10","15","20","25","30","35","40","45" ),
|
||||
MenuRowDef(ScreenEdit::set_mods,
|
||||
"Set modifiers",
|
||||
true, EditMode_Practice, true, true, 0, "Press Start" ),
|
||||
MenuRowDef(ScreenEdit::remove,
|
||||
"Remove",
|
||||
true, EditMode_Practice, true, true, 0, "Press Start" )
|
||||
);
|
||||
|
||||
static MenuDef g_InsertStepAttack("ScreenMiniMenuInsertCourseAttack",
|
||||
MenuRowDef( ScreenEdit::sa_duration, "Duration seconds", true, EditMode_Practice, true, false, 3, "5","10","15","20","25","30","35","40","45" ),
|
||||
MenuRowDef( ScreenEdit::sa_set_mods, "Set modifiers", true, EditMode_Practice, true, true, 0, "Press Start" ),
|
||||
MenuRowDef( ScreenEdit::sa_remove, "Remove", true, EditMode_Practice, true, true, 0, "Press Start" ));
|
||||
static MenuDef g_InsertStepAttack(
|
||||
"ScreenMiniMenuInsertCourseAttack",
|
||||
MenuRowDef(ScreenEdit::sa_duration,
|
||||
"Duration seconds",
|
||||
true, EditMode_Practice, true, false, 3, "5","10","15","20","25","30","35","40","45" ),
|
||||
MenuRowDef(ScreenEdit::sa_set_mods,
|
||||
"Set modifiers",
|
||||
true, EditMode_Practice, true, true, 0, "Press Start" ),
|
||||
MenuRowDef(ScreenEdit::sa_remove,
|
||||
"Remove",
|
||||
true, EditMode_Practice, true, true, 0, "Press Start" ));
|
||||
|
||||
static MenuDef g_CourseMode(
|
||||
"ScreenMiniMenuCourseDisplay",
|
||||
|
||||
Reference in New Issue
Block a user