RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-03-11 05:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Doesn't allow randomizer to select invisible maps

Browse Source
This commit is contained in:
Endrik Tombak 2017-12-31 03:10:54 +02:00
parent 398d90ee52
commit d032790e19
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -231,8 +231,8 @@ namespace osu.Game.Screens.Select
public void SelectNextRandom() public void SelectNextRandom()
{ {
var visible = beatmapSets.Where(s => !s.Filtered).ToList(); var visibleSets = beatmapSets.Where(s => !s.Filtered).ToList();
if (!visible.Any()) if (!visibleSets.Any())
return; return;
if (selectedBeatmap != null) if (selectedBeatmap != null)
@ -249,20 +249,21 @@ namespace osu.Game.Screens.Select
if (RandomAlgorithm == RandomSelectAlgorithm.RandomPermutation) if (RandomAlgorithm == RandomSelectAlgorithm.RandomPermutation)
{ {
var notYetVisitedSets = visible.Except(previouslyVisitedRandomSets).ToList(); var notYetVisitedSets = visibleSets.Except(previouslyVisitedRandomSets).ToList();
if (!notYetVisitedSets.Any()) if (!notYetVisitedSets.Any())
{ {
previouslyVisitedRandomSets.Clear(); previouslyVisitedRandomSets.Clear();
notYetVisitedSets = visible; notYetVisitedSets = visibleSets;
} }
set = notYetVisitedSets.ElementAt(RNG.Next(notYetVisitedSets.Count)); set = notYetVisitedSets.ElementAt(RNG.Next(notYetVisitedSets.Count));
previouslyVisitedRandomSets.Add(set); previouslyVisitedRandomSets.Add(set);
} }
else else
set = visible.ElementAt(RNG.Next(visible.Count)); set = visibleSets.ElementAt(RNG.Next(visibleSets.Count));
select(set.Beatmaps.Skip(RNG.Next(set.Beatmaps.Count())).FirstOrDefault()); var visibleBeatmaps = set.Beatmaps.Where(s => !s.Filtered).ToList();
select(visibleBeatmaps.Skip(RNG.Next(visibleBeatmaps.Count())).FirstOrDefault());
} }
public void SelectPreviousRandom() public void SelectPreviousRandom()