MSD sort orders (#106)

etternagame · Nov 17, 2017 · e53de21 · e53de21
1 parent 26559ef
commit e53de21
Show file tree

Hide file tree

Showing 19 changed files with 279 additions and 181 deletions.
diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/currentsort.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/currentsort.lua
@@ -17,7 +17,15 @@ local sortTable = {
 	SortOrder_ModeMenu 				= 'Mode Menu',
 	SortOrder_Length 				= 'Song Length',
 	SortOrder_Recent 				= 'Recently Played',
-	SortOrder_Favorites				= 'Favorites'
+	SortOrder_Favorites				= 'Favorites',
+	SortOrder_Overall				= 'Overall',
+	SortOrder_Stream				= 'Stream',
+	SortOrder_Jumpstream				= 'Jumpstream',
+	SortOrder_Handstream				= 'Handstream',
+	SortOrder_Stamina				= 'Stamina',
+	SortOrder_JackSpeed				= 'JackSpeed',
+	SortOrder_Chordjack				= 'Chordjack',
+	SortOrder_Technical				= 'Technical'
 }
 
 t[#t+1] = Def.Quad{

diff --git a/Themes/_fallback/Graphics/Banner Chordjack.redir b/Themes/_fallback/Graphics/Banner Chordjack.redir
@@ -0,0 +1 @@
+Common fallback banner
diff --git a/Themes/_fallback/Graphics/Banner Favorites.redir b/Themes/_fallback/Graphics/Banner Favorites.redir
@@ -0,0 +1 @@
+Common fallback banner
diff --git a/Themes/_fallback/Graphics/Banner Handstream.redir b/Themes/_fallback/Graphics/Banner Handstream.redir
@@ -0,0 +1 @@
+Common fallback banner
diff --git a/Themes/_fallback/Graphics/Banner JackSpeed.redir b/Themes/_fallback/Graphics/Banner JackSpeed.redir
@@ -0,0 +1 @@
+Common fallback banner
diff --git a/Themes/_fallback/Graphics/Banner Jumpstream.redir b/Themes/_fallback/Graphics/Banner Jumpstream.redir
@@ -0,0 +1 @@
+Common fallback banner
diff --git a/Themes/_fallback/Graphics/Banner Overall.redir b/Themes/_fallback/Graphics/Banner Overall.redir
@@ -0,0 +1 @@
+Common fallback banner
diff --git a/Themes/_fallback/Graphics/Banner Stamina.redir b/Themes/_fallback/Graphics/Banner Stamina.redir
@@ -0,0 +1 @@
+Common fallback banner
diff --git a/Themes/_fallback/Graphics/Banner Stream.redir b/Themes/_fallback/Graphics/Banner Stream.redir
@@ -0,0 +1 @@
+Common fallback banner
diff --git a/Themes/_fallback/Graphics/Banner Technical.redir b/Themes/_fallback/Graphics/Banner Technical.redir
@@ -0,0 +1 @@
+Common fallback banner
diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
@@ -298,6 +298,14 @@ PreferredText=Preferred
 TitleText=Title
 RecentText=Recent
 FavoritesText=Favorites
+OverallText=Overall
+StreamText=Stream
+JumpstreamText=Jumpstream
+HandstreamText=Handstream
+StaminaText=Stamina
+JackSpeedText=JackSpeed
+ChordjackText=Chordjack
+TechnicalText=Technical
 TopGradesText=Top Grades
 
 [NetworkSyncManager]

diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
@@ -899,7 +899,7 @@ RecentSongsToShow=30
 
 UseEasyMarkerFlag=false
 
-ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,Genre,Recent,Favorites"
+ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,Genre,Recent,Favorites,Overall,Stream,Jumpstream,Handstream,Stamina,JackSpeed,Chordjack,Technical"
 ChoicePreferred="sort,Preferred"
 ChoiceGroup="sort,Group"
 ChoiceTitle="sort,Title"
@@ -910,6 +910,14 @@ ChoiceArtist="sort,Artist"
 ChoiceGenre="sort,Genre"
 ChoiceRecent="sort,Recent"
 ChoiceFavorites="sort,Favorites"
+ChoiceOverall="sort,Overall"
+ChoiceStream="sort,Stream"
+ChoiceJumpstream="sort,Jumpstream"
+ChoiceHandstream="sort,Handstream"
+ChoiceStamina="sort,Stamina"
+ChoiceJackSpeed="sort,JackSpeed"
+ChoiceChordjack="sort,Chordjack"
+ChoiceTechnical="sort,Technical"
 
 CustomWheelItemNames=""
 

diff --git a/src/GameConstantsAndTypes.cpp b/src/GameConstantsAndTypes.cpp
@@ -136,6 +136,14 @@ static const char *SortOrderNames[] = {
 	"ModeMenu",
 	"Recent",
 	"Favorites",
+	"Overall",
+	"Stream",
+	"Jumpstream",
+	"Handstream",
+	"Stamina",
+	"JackSpeed",
+	"Chordjack",
+	"Technical"
 };
 XToString( SortOrder );
 StringToX( SortOrder );

diff --git a/src/GameConstantsAndTypes.h b/src/GameConstantsAndTypes.h
@@ -172,6 +172,14 @@ enum SortOrder
 	SORT_MODE_MENU, /**< Have access to the menu for choosing the sort. */
 	SORT_RECENT,
 	SORT_FAVORITES,
+	SORT_Overall,
+	SORT_Stream,
+	SORT_Jumpstream,
+	SORT_Handstream,
+	SORT_Stamina,
+	SORT_JackSpeed,
+	SORT_Chordjack,
+	SORT_Technical,
 	NUM_SortOrder,
 	SortOrder_Invalid
 };