Use actual mod-adjusted map difficulty settings in the SongBar

[stanriders]

This also changes the bpm format to be consistent with the rest of the game. I would love for the SR display to show real values too, but that requires loading a full beatmap and the tournament client only has access to the metadata.

NM:

HR:

DT:

Mania NM:

Mania HR:

[peppy]

Could probably download the .osu file to get full stats using the /osu/ endpoint?

[stanriders]

Yea maybe, but that would require adding an .osu cache and predownload handling so I'd rather do it as a separate PR

[bdach]

What is this change for? I really don't like the look of it.

[stanriders]

TournamentBeatmap by itself is pretty much just a metadata wrapper

[bdach]

Can

osu/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs

Lines 143 to 185 in 6bb84e4

	public class APIRuleset : IRulesetInfo
	{
	public int OnlineID { get; set; } = -1;
	public string Name => $@"{nameof(APIRuleset)} (ID: {OnlineID})";
	public string ShortName
	{
	get
	{
	// TODO: this should really not exist.
	switch (OnlineID)
	{
	case 0: return "osu";
	case 1: return "taiko";
	case 2: return "fruits";
	case 3: return "mania";
	default: throw new ArgumentOutOfRangeException();
	}
	}
	}
	public string InstantiationInfo => string.Empty;
	public Ruleset CreateInstance() => throw new NotImplementedException();
	public bool Equals(IRulesetInfo? other) => other is APIRuleset r && this.MatchesOnlineID(r);
	public int CompareTo(IRulesetInfo? other)
	{
	if (!(other is APIRuleset ruleset))
	throw new ArgumentException($@"Object is not of type {nameof(APIRuleset)}.", nameof(other));
	return OnlineID.CompareTo(ruleset.OnlineID);
	}
	// ReSharper disable once NonReadonlyMemberInGetHashCode
	public override int GetHashCode() => OnlineID;
	}

be used (copied out from APIBeatmap in ctor) instead at least?

I really don't like these sorts of model hacks because they have a tendency to produce nasty buggage later. At least I'd like to have things in vaguely the correct wheelhouse rather just a blank model instance...

[stanriders]

If you're fine with it not being populated with anything and just always being OnlineID = -1 - sure

[bdach]

I don't get why though, surely you could just

diff --git a/osu.Game.Tournament/Models/TournamentBeatmap.cs b/osu.Game.Tournament/Models/TournamentBeatmap.cs
index a7ba5b7db1..59003bc739 100644
--- a/osu.Game.Tournament/Models/TournamentBeatmap.cs
+++ b/osu.Game.Tournament/Models/TournamentBeatmap.cs
@@ -47,6 +47,7 @@ public TournamentBeatmap(APIBeatmap beatmap)
             Covers = beatmap.BeatmapSet?.Covers ?? new BeatmapSetOnlineCovers();
             EndTimeObjectCount = beatmap.EndTimeObjectCount;
             TotalObjectCount = beatmap.TotalObjectCount;
+            Ruleset = beatmap.Ruleset;
         }
 
         public bool Equals(IBeatmapInfo? other) => other is TournamentBeatmap b && this.MatchesOnlineID(b);

no? What am I missing here?

[stanriders]

Beatmap gets created from IPC, I'm pretty sure it wouldn't have ruleset unless stable starts sending one

[bdach]

That's not how any of that works. The "IPC" does an API request to look the beatmap up.

osu/osu.Game.Tournament/IPC/FileBasedIPC.cs

Lines 79 to 107 in cf9c812

	int beatmapId = int.Parse(sr.ReadLine().AsNonNull());
	int mods = int.Parse(sr.ReadLine().AsNonNull());
	if (lastBeatmapId != beatmapId)
	{
	beatmapLookupRequest?.Cancel();
	lastBeatmapId = beatmapId;
	var existing = ladder.CurrentMatch.Value?.Round.Value?.Beatmaps.FirstOrDefault(b => b.ID == beatmapId);
	if (existing != null)
	Beatmap.Value = existing.Beatmap;
	else
	{
	beatmapLookupRequest = new GetBeatmapRequest(new APIBeatmap { OnlineID = beatmapId });
	beatmapLookupRequest.Success += b =>
	{
	if (lastBeatmapId == beatmapId)
	Beatmap.Value = new TournamentBeatmap(b);
	};
	beatmapLookupRequest.Failure += _ =>
	{
	if (lastBeatmapId == beatmapId)
	Beatmap.Value = null;
	};
	API.Queue(beatmapLookupRequest);
	}
	}

[stanriders]

That's...quite a structure. Should be simple then, I'll fix it now