diff --git a/Themes/Til Death/metrics.ini b/Themes/Til Death/metrics.ini index f2820a2ab0..6b4eb1fd2c 100644 --- a/Themes/Til Death/metrics.ini +++ b/Themes/Til Death/metrics.ini @@ -252,13 +252,11 @@ CodeColorStart="Start" [MusicWheel] SwitchSeconds=0.10 -RandomPicksLockedSongs=true UseSectionsWithPreferredGroup=false OnlyShowActiveSection=false HideActiveSectionTitle=true RemindWheelPositions=true # -RouletteSwitchSeconds=0.05 RouletteSlowDownSwitches=5 LockedInitialVelocity=15 diff --git a/Themes/_fallback/base._ini b/Themes/_fallback/base._ini index 51b87f53c4..e6e18c1997 100644 --- a/Themes/_fallback/base._ini +++ b/Themes/_fallback/base._ini @@ -1476,7 +1476,6 @@ GradeP2Y=5 [MusicWheel] SwitchSeconds=0.10 -RandomPicksLockedSongs=true RouletteSwitchSeconds=0.05 RouletteSlowDownSwitches=5 LockedInitialVelocity=7 @@ -1517,10 +1516,8 @@ SectionColor4=color("0.0,0.6,0.6,1") -- sea green SectionColor5=color("0.1,0.7,0.3,1") -- green SectionColor6=color("0.8,0.6,0.0,1") -- orange SectionColor7=color("1.0,0.3,0.3,1") -- light red -SongRealExtraColor=color("0.9,0.9,0,1") -- yellow SortMenuColor=color("1,1,0,1") SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Popularity", "SortOrder_Artist", "SortOrder_Genre" } -MostPlayedSongsToShow=30 ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter,Genre,Length" ChoicePreferred="sort,Preferred" ChoiceGroup="sort,Group" @@ -1534,7 +1531,6 @@ ChoiceEasyMeter="sort,EasyMeter" ChoiceMediumMeter="sort,MediumMeter" ChoiceHardMeter="sort,HardMeter" ChoiceLength="sort,Length" -UseEasyMarkerFlag=false [RoomWheel] Fallback="MusicWheel" diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index c1601cdbcc..b7ce75ab11 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -556,7 +556,6 @@ WarningBeepStart=0 [MusicWheel] SwitchSeconds=0.10 -RandomPicksLockedSongs=true UseSectionsWithPreferredGroup=false OnlyShowActiveSection=false HideActiveSectionTitle=true @@ -584,12 +583,8 @@ WheelItemLockedColor=color("0,0,0,0.5") NumSectionColors=1 SectionColor1=color("1,1,1,1") # -SongRealExtraColor=color("1,0,0,1") SortMenuColor=color("1,1,1,1") # -RouletteColor=color("1,0,0,1") -RandomColor=color("1,0,0,1") -PortalColor=color("1,0,0,1") EmptyColor=color("1,0,0,1") SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Artist", "SortOrder_Genre" } @@ -597,19 +592,13 @@ SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortO ShowSectionsInBPMSort=true SortBPMDivision=20 -MostPlayedSongsToShow=30 -RecentSongsToShow=30 - -UseEasyMarkerFlag=false - -ModeMenuChoiceNames="Group,Title,Bpm,TopGrades,Artist,Genre,Recent,Favorites,Overall,Stream,Jumpstream,Handstream,Stamina,JackSpeed,Chordjack,Technical,Length" +ModeMenuChoiceNames="Group,Title,Bpm,TopGrades,Artist,Genre,Favorites,Overall,Stream,Jumpstream,Handstream,Stamina,JackSpeed,Chordjack,Technical,Length" ChoiceGroup="sort,Group" ChoiceTitle="sort,Title" ChoiceBpm="sort,BPM" ChoiceTopGrades="sort,TopGrades" ChoiceArtist="sort,Artist" ChoiceGenre="sort,Genre" -ChoiceRecent="sort,Recent" ChoiceFavorites="sort,Favorites" ChoiceOverall="sort,Overall" ChoiceStream="sort,Stream" diff --git a/src/Etterna/Actor/Menus/MusicWheel.cpp b/src/Etterna/Actor/Menus/MusicWheel.cpp index ba1d8d2ad6..03c535667c 100644 --- a/src/Etterna/Actor/Menus/MusicWheel.cpp +++ b/src/Etterna/Actor/Menus/MusicWheel.cpp @@ -67,17 +67,11 @@ MusicWheel::MakeItem() void MusicWheel::Load(const string& sType) { - ROULETTE_SWITCH_SECONDS.Load(sType, "RouletteSwitchSeconds"); ROULETTE_SLOW_DOWN_SWITCHES.Load(sType, "RouletteSlowDownSwitches"); NUM_SECTION_COLORS.Load(sType, "NumSectionColors"); - SONG_REAL_EXTRA_COLOR.Load(sType, "SongRealExtraColor"); SORT_MENU_COLOR.Load(sType, "SortMenuColor"); - RANDOM_PICKS_LOCKED_SONGS.Load(sType, "RandomPicksLockedSongs"); - MOST_PLAYED_SONGS_TO_SHOW.Load(sType, "MostPlayedSongsToShow"); - RECENT_SONGS_TO_SHOW.Load(sType, "RecentSongsToShow"); MODE_MENU_CHOICE_NAMES.Load(sType, "ModeMenuChoiceNames"); SORT_ORDERS.Load(sType, "SortOrders"); - SHOW_EASY_FLAG.Load(sType, "UseEasyMarkerFlag"); USE_SECTIONS_WITH_PREFERRED_GROUP.Load(sType, "UseSectionsWithPreferredGroup"); HIDE_INACTIVE_SECTIONS.Load(sType, "OnlyShowActiveSection"); @@ -95,9 +89,6 @@ MusicWheel::Load(const string& sType) CUSTOM_CHOICE_COLORS.Load( sType, CUSTOM_WHEEL_ITEM_COLOR, vsCustomItemNames); - ROULETTE_COLOR.Load(sType, "RouletteColor"); - RANDOM_COLOR.Load(sType, "RandomColor"); - PORTAL_COLOR.Load(sType, "PortalColor"); EMPTY_COLOR.Load(sType, "EmptyColor"); WheelBase::Load(sType); diff --git a/src/Etterna/Actor/Menus/MusicWheel.h b/src/Etterna/Actor/Menus/MusicWheel.h index 638e78e4c4..2ed317bc0e 100644 --- a/src/Etterna/Actor/Menus/MusicWheel.h +++ b/src/Etterna/Actor/Menus/MusicWheel.h @@ -97,27 +97,18 @@ class MusicWheel : public WheelBase bool WheelItemIsVisible(int n); - ThemeMetric ROULETTE_SWITCH_SECONDS; ThemeMetric ROULETTE_SLOW_DOWN_SWITCHES; ThemeMetric NUM_SECTION_COLORS; - ThemeMetric SONG_REAL_EXTRA_COLOR; ThemeMetric SORT_MENU_COLOR; - ThemeMetric RANDOM_PICKS_LOCKED_SONGS; - ThemeMetric MOST_PLAYED_SONGS_TO_SHOW; - ThemeMetric RECENT_SONGS_TO_SHOW; ThemeMetric MODE_MENU_CHOICE_NAMES; ThemeMetricMap CHOICE; ThemeMetric1D SECTION_COLORS; ThemeMetric SORT_ORDERS; - ThemeMetric SHOW_EASY_FLAG; // sm-ssc additions: ThemeMetric USE_SECTIONS_WITH_PREFERRED_GROUP; ThemeMetric HIDE_INACTIVE_SECTIONS; ThemeMetric HIDE_ACTIVE_SECTION_TITLE; ThemeMetric REMIND_WHEEL_POSITIONS; - ThemeMetric ROULETTE_COLOR; - ThemeMetric RANDOM_COLOR; - ThemeMetric PORTAL_COLOR; ThemeMetric EMPTY_COLOR; vector m_viWheelPositions; ThemeMetric CUSTOM_WHEEL_ITEM_NAMES;