sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Cancel beatmap random selection

Browse Source
This commit is contained in:
EVAST9919
2017-06-01 20:54:42 +03:00
parent 900e3ce3e2
commit a42c67ee97
5 changed files with 65 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,8 +77,9 @@ namespace osu.Game.Screens.Select
private readonly List<Panel> panels = new List<Panel>();
private BeatmapGroup selectedGroup;
private readonly Stack<BeatmapGroup> randomSelectedBeatmaps = new Stack<BeatmapGroup>();
private BeatmapGroup selectedGroup;
private BeatmapPanel selectedPanel;
public BeatmapCarousel()
@ -172,14 +173,17 @@ namespace osu.Game.Screens.Select
public void SelectRandom()
{
IEnumerable<BeatmapGroup> visibleGroups = groups.Where(selectGroup => selectGroup.State != BeatmapGroupState.Hidden);
randomSelectedBeatmaps.Push(selectedGroup);
var visibleGroups = getVisibleGroups();
if (!visibleGroups.Any())
return;
BeatmapGroup group;
if (randomType == SelectionRandomType.RandomPermutation)
{
IEnumerable<BeatmapGroup> notSeenGroups = visibleGroups.Except(seenGroups);
var notSeenGroups = visibleGroups.Except(seenGroups);
if (!notSeenGroups.Any())
{
seenGroups.Clear();
@ -197,6 +201,38 @@ namespace osu.Game.Screens.Select
selectGroup(group, panel);
}
public void CancelRandom()
{
if (!randomSelectedBeatmaps.Any())
return;
var visibleGroups = getVisibleGroups();
if (!visibleGroups.Any())
return;
// we can avoid selecting deleted beatmaps or beatmaps selected in another gamemode
while (true)
{
if (!randomSelectedBeatmaps.Any()) break;
if (!visibleGroups.Contains(randomSelectedBeatmaps.FirstOrDefault()))
{
randomSelectedBeatmaps.Pop();
}
else
{
BeatmapGroup beatmapGroup = randomSelectedBeatmaps.Pop();
selectGroup(beatmapGroup, beatmapGroup.SelectedPanel);
break;
}
}
}
private IEnumerable<BeatmapGroup> getVisibleGroups()
{
return groups.Where(selectGroup => selectGroup.State != BeatmapGroupState.Hidden);
}
private FilterCriteria criteria = new FilterCriteria();
private ScheduledDelegate filterTask;