h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 10:18:22 +08:00
Code Issues Releases Wiki Activity

Only include user skins in random choices

Browse Source
This commit is contained in:
Dean Herbert 2020-11-11 12:03:38 +09:00
parent 6b548ef5e4
commit 6674628bc7
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Overlays/Settings/Sections/SkinSection.cs
View File

@ -113,24 +113,28 @@ namespace osu.Game.Overlays.Settings.Sections
private void randomizeSkin()
{
int count = skinItems.Count - 1; // exclude "random" item.
// choose from only user skins, removing the current selection to ensure a new one is chosen.
var randomChoices = skinItems.Where(s => s.ID > 0 && s.ID != configBindable.Value).ToArray();
if (count <= 1)
if (randomChoices.Length == 0)
{
configBindable.Value = SkinInfo.Default.ID;
return;
}
// ensure the random selection is never the same as the previous.
configBindable.Value = skinItems.Where(s => s.ID != configBindable.Value).ElementAt(RNG.Next(0, count)).ID;
configBindable.Value = randomChoices.ElementAt(RNG.Next(0, randomChoices.Length)).ID;
}
private void updateItems()
{
skinItems = skins.GetAllUsableSkins();
if (skinItems.Count > 1)
skinItems.Add(random_skin_info);
// insert after lazer built-in skins
int firstNonDefault = skinItems.FindIndex(s => s.ID > 0);
if (firstNonDefault < 0)
firstNonDefault = skinItems.Count;
skinItems.Insert(firstNonDefault, random_skin_info);
skinDropdown.Items = skinItems;
}