h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-06 21:02:59 +08:00
Code Issues Releases Wiki Activity

Move and change logic

Browse Source
This commit is contained in:
Endrik Tombak 2020-03-26 18:42:08 +02:00
parent 2f5dc93d61
commit ee112c6f50
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,8 @@ using osu.Game.Graphics.Cursor;
using osu.Game.Input.Bindings; using osu.Game.Input.Bindings;
using osu.Game.Screens.Select.Carousel; using osu.Game.Screens.Select.Carousel;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Users; using osu.Game.Rulesets;
using osu.Game.Online.API.Requests;
namespace osu.Game.Screens.Select namespace osu.Game.Screens.Select
{ {
@ -33,7 +34,7 @@ namespace osu.Game.Screens.Select
private const float bleed_top = FilterControl.HEIGHT; private const float bleed_top = FilterControl.HEIGHT;
private const float bleed_bottom = Footer.HEIGHT; private const float bleed_bottom = Footer.HEIGHT;
private readonly Bindable<User> localUser = new Bindable<User>(); private readonly Bindable<double> recommendedStarDifficulty = new Bindable<double>();
/// <summary> /// <summary>
/// Triggered when the <see cref="BeatmapSets"/> loaded change and are completely loaded. /// Triggered when the <see cref="BeatmapSets"/> loaded change and are completely loaded.
@ -143,8 +144,11 @@ namespace osu.Game.Screens.Select
[Resolved] [Resolved]
private BeatmapManager beatmaps { get; set; } private BeatmapManager beatmaps { get; set; }
[Resolved]
private IAPIProvider api { get; set; }
[BackgroundDependencyLoader(permitNulls: true)] [BackgroundDependencyLoader(permitNulls: true)]
private void load(OsuConfigManager config, IAPIProvider api) private void load(OsuConfigManager config, Bindable<RulesetInfo> decoupledRuleset)
{ {
config.BindWith(OsuSetting.RandomSelectAlgorithm, RandomAlgorithm); config.BindWith(OsuSetting.RandomSelectAlgorithm, RandomAlgorithm);
config.BindWith(OsuSetting.SongSelectRightMouseScroll, RightClickScrollingEnabled); config.BindWith(OsuSetting.SongSelectRightMouseScroll, RightClickScrollingEnabled);
@ -159,7 +163,26 @@ namespace osu.Game.Screens.Select
loadBeatmapSets(GetLoadableBeatmaps()); loadBeatmapSets(GetLoadableBeatmaps());
localUser.BindTo(api.LocalUser); decoupledRuleset.BindValueChanged(UpdateRecommendedStarDifficulty, true);
}
protected void UpdateRecommendedStarDifficulty(ValueChangedEvent<RulesetInfo> ruleset)
{
if (api.LocalUser.Value is GuestUser)
{
recommendedStarDifficulty.Value = 0;
return;
}
var req = new GetUserRequest(api.LocalUser.Value.Id, ruleset.NewValue);
req.Success += result =>
{
// algorithm taken from https://github.com/ppy/osu-web/blob/e6e2825516449e3d0f3f5e1852c6bdd3428c3437/app/Models/User.php#L1505
recommendedStarDifficulty.Value = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
};
api.PerformAsync(req);
} }
protected virtual IEnumerable<BeatmapSetInfo> GetLoadableBeatmaps() => beatmaps.GetAllUsableBeatmapSetsEnumerable(); protected virtual IEnumerable<BeatmapSetInfo> GetLoadableBeatmaps() => beatmaps.GetAllUsableBeatmapSetsEnumerable();
@ -594,7 +617,7 @@ namespace osu.Game.Screens.Select
b.Metadata = beatmapSet.Metadata; b.Metadata = beatmapSet.Metadata;
} }
var set = new CarouselBeatmapSet(beatmapSet, localUser); var set = new CarouselBeatmapSet(beatmapSet, recommendedStarDifficulty);
foreach (var c in set.Beatmaps) foreach (var c in set.Beatmaps)
{ {

12
osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
View File

@ -8,19 +8,18 @@ using osu.Framework.Bindables;
using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Screens.Select.Filter; using osu.Game.Screens.Select.Filter;
using osu.Game.Users;
namespace osu.Game.Screens.Select.Carousel namespace osu.Game.Screens.Select.Carousel
{ {
public class CarouselBeatmapSet : CarouselGroupEagerSelect public class CarouselBeatmapSet : CarouselGroupEagerSelect
{ {
private readonly Bindable<User> localUser; private readonly Bindable<double> recommendedStarDifficulty = new Bindable<double>();
public IEnumerable<CarouselBeatmap> Beatmaps => InternalChildren.OfType<CarouselBeatmap>(); public IEnumerable<CarouselBeatmap> Beatmaps => InternalChildren.OfType<CarouselBeatmap>();
public BeatmapSetInfo BeatmapSet; public BeatmapSetInfo BeatmapSet;
public CarouselBeatmapSet(BeatmapSetInfo beatmapSet, Bindable<User> localUser) public CarouselBeatmapSet(BeatmapSetInfo beatmapSet, Bindable<double> recommendedStarDifficulty)
{ {
BeatmapSet = beatmapSet ?? throw new ArgumentNullException(nameof(beatmapSet)); BeatmapSet = beatmapSet ?? throw new ArgumentNullException(nameof(beatmapSet));
@ -29,7 +28,7 @@ namespace osu.Game.Screens.Select.Carousel
.Select(b => new CarouselBeatmap(b)) .Select(b => new CarouselBeatmap(b))
.ForEach(AddChild); .ForEach(AddChild);
this.localUser = localUser; this.recommendedStarDifficulty.BindTo(recommendedStarDifficulty);
} }
protected override DrawableCarouselItem CreateDrawableRepresentation() => new DrawableCarouselBeatmapSet(this); protected override DrawableCarouselItem CreateDrawableRepresentation() => new DrawableCarouselBeatmapSet(this);
@ -38,14 +37,11 @@ namespace osu.Game.Screens.Select.Carousel
{ {
if (LastSelected == null) if (LastSelected == null)
{ {
decimal? pp = localUser.Value?.Statistics?.PP ?? 60; // TODO: This needs to get ruleset specific statistics
var recommendedDifficulty = Math.Pow((double)pp, 0.4) * 0.195;
return Children.OfType<CarouselBeatmap>() return Children.OfType<CarouselBeatmap>()
.Where(b => !b.Filtered.Value) .Where(b => !b.Filtered.Value)
.OrderBy(b => .OrderBy(b =>
{ {
var difference = b.Beatmap.StarDifficulty - recommendedDifficulty; var difference = b.Beatmap.StarDifficulty - recommendedStarDifficulty.Value;
return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
}) })
.FirstOrDefault(); .FirstOrDefault();