h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 20:07:25 +08:00
Code Issues Releases Wiki Activity

Rename BeatmapInfo.StarDifficulty to StarRating to match underlying interface

Browse Source
This commit is contained in:
Dean Herbert 2021-11-11 17:18:51 +09:00
parent 374d1cc241
commit ebe58cee11
16 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
private BeatmapInfo getExampleBeatmap() => new BeatmapInfo private BeatmapInfo getExampleBeatmap() => new BeatmapInfo
{ {
Ruleset = new RulesetInfo { ID = 5 }, Ruleset = new RulesetInfo { ID = 5 },
StarDifficulty = 4.0d, StarRating = 4.0d,
BaseDifficulty = new BeatmapDifficulty BaseDifficulty = new BeatmapDifficulty
{ {
ApproachRate = 5.0f, ApproachRate = 5.0f,

8
osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoom.cs
View File

@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
{ {
BeatmapInfo = BeatmapInfo =
{ {
StarDifficulty = 2.5 StarRating = 2.5
} }
}.BeatmapInfo, }.BeatmapInfo,
} }
@ -82,7 +82,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
{ {
BeatmapInfo = BeatmapInfo =
{ {
StarDifficulty = 2.5, StarRating = 2.5,
Metadata = Metadata =
{ {
Artist = "very very very very very very very very very long artist", Artist = "very very very very very very very very very long artist",
@ -111,7 +111,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
{ {
BeatmapInfo = BeatmapInfo =
{ {
StarDifficulty = 2.5 StarRating = 2.5
} }
}.BeatmapInfo, }.BeatmapInfo,
} }
@ -124,7 +124,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
{ {
BeatmapInfo = BeatmapInfo =
{ {
StarDifficulty = 4.5 StarRating = 4.5
} }
}.BeatmapInfo, }.BeatmapInfo,
} }

4
osu.Game.Tests/Visual/Multiplayer/TestSceneStarRatingRangeDisplay.cs
View File

@ -31,8 +31,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
{ {
SelectedRoom.Value.Playlist.AddRange(new[] SelectedRoom.Value.Playlist.AddRange(new[]
{ {
new PlaylistItem { Beatmap = { Value = new BeatmapInfo { StarDifficulty = min } } }, new PlaylistItem { Beatmap = { Value = new BeatmapInfo { StarRating = min } } },
new PlaylistItem { Beatmap = { Value = new BeatmapInfo { StarDifficulty = max } } }, new PlaylistItem { Beatmap = { Value = new BeatmapInfo { StarRating = max } } },
}); });
}); });
} }

4
osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
View File

@ -46,7 +46,7 @@ namespace osu.Game.Tests.Visual.SongSelect
OverallDifficulty = 5.7f, OverallDifficulty = 5.7f,
ApproachRate = 3.5f ApproachRate = 3.5f
}, },
StarDifficulty = 4.5f StarRating = 4.5f
}; };
[Test] [Test]
@ -76,7 +76,7 @@ namespace osu.Game.Tests.Visual.SongSelect
OverallDifficulty = 4.5f, OverallDifficulty = 4.5f,
ApproachRate = 3.1f ApproachRate = 3.1f
}, },
StarDifficulty = 8 StarRating = 8
}); });
AddAssert("first bar text is Key Count", () => advancedStats.ChildrenOfType<SpriteText>().First().Text == "Key Count"); AddAssert("first bar text is Key Count", () => advancedStats.ChildrenOfType<SpriteText>().First().Text == "Key Count");

10
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
View File

@ -435,8 +435,8 @@ namespace osu.Game.Tests.Visual.SongSelect
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
var set = createTestBeatmapSet(i); var set = createTestBeatmapSet(i);
set.Beatmaps[0].StarDifficulty = 3 - i; set.Beatmaps[0].StarRating = 3 - i;
set.Beatmaps[2].StarDifficulty = 6 + i; set.Beatmaps[2].StarRating = 6 + i;
sets.Add(set); sets.Add(set);
} }
@ -686,7 +686,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Version = $"Stars: {i}", Version = $"Stars: {i}",
Ruleset = new OsuRuleset().RulesetInfo, Ruleset = new OsuRuleset().RulesetInfo,
StarDifficulty = i, StarRating = i,
}); });
} }
@ -869,7 +869,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
OnlineBeatmapID = id++ * 10, OnlineBeatmapID = id++ * 10,
Version = version, Version = version,
StarDifficulty = diff, StarRating = diff,
Ruleset = new OsuRuleset().RulesetInfo, Ruleset = new OsuRuleset().RulesetInfo,
BaseDifficulty = new BeatmapDifficulty BaseDifficulty = new BeatmapDifficulty
{ {
@ -904,7 +904,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Path = $"extra{b}.osu", Path = $"extra{b}.osu",
Version = $"Extra {b}", Version = $"Extra {b}",
Ruleset = rulesets.GetRuleset((b - 1) % 4), Ruleset = rulesets.GetRuleset((b - 1) % 4),
StarDifficulty = 2, StarRating = 2,
BaseDifficulty = new BeatmapDifficulty BaseDifficulty = new BeatmapDifficulty
{ {
OverallDifficulty = 3.5f, OverallDifficulty = 3.5f,

2
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
View File

@ -198,7 +198,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Title = $"{ruleset.ShortName}Title" Title = $"{ruleset.ShortName}Title"
}, },
Ruleset = ruleset, Ruleset = ruleset,
StarDifficulty = 6, StarRating = 6,
Version = $"{ruleset.ShortName}Version", Version = $"{ruleset.ShortName}Version",
BaseDifficulty = new BeatmapDifficulty() BaseDifficulty = new BeatmapDifficulty()
}, },

4
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
View File

@ -46,7 +46,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Title = title, Title = title,
}, },
Version = version, Version = version,
StarDifficulty = RNG.NextDouble(0, 10), StarRating = RNG.NextDouble(0, 10),
} }
})); }));
} }
@ -65,7 +65,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Title = "Heavy beatmap", Title = "Heavy beatmap",
}, },
Version = "10k objects", Version = "10k objects",
StarDifficulty = 99.99f, StarRating = 99.99f,
} }
})); }));

2
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
View File

@ -188,7 +188,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Metadata = metadata, Metadata = metadata,
BaseDifficulty = new BeatmapDifficulty(), BaseDifficulty = new BeatmapDifficulty(),
Ruleset = ruleset, Ruleset = ruleset,
StarDifficulty = difficultyIndex + 1, StarRating = difficultyIndex + 1,
Version = $"SR{difficultyIndex + 1}" Version = $"SR{difficultyIndex + 1}"
}).ToList() }).ToList()
}; };

8
osu.Game/Beatmaps/BeatmapInfo.cs
View File

@ -139,7 +139,8 @@ namespace osu.Game.Beatmaps
private string versionString => string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]"; private string versionString => string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
[JsonProperty("difficulty_rating")] [JsonProperty("difficulty_rating")]
public double StarDifficulty { get; set; } [Column("StarDifficulty")]
public double StarRating { get; set; }
/// <summary> /// <summary>
/// Currently only populated for beatmap deletion. Use <see cref="ScoreManager"/> to query scores. /// Currently only populated for beatmap deletion. Use <see cref="ScoreManager"/> to query scores.
@ -147,7 +148,7 @@ namespace osu.Game.Beatmaps
public List<ScoreInfo> Scores { get; set; } public List<ScoreInfo> Scores { get; set; }
[JsonIgnore] [JsonIgnore]
public DifficultyRating DifficultyRating => BeatmapDifficultyCache.GetDifficultyRating(StarDifficulty); public DifficultyRating DifficultyRating => BeatmapDifficultyCache.GetDifficultyRating(StarRating);
public override string ToString() => this.GetDisplayTitle(); public override string ToString() => this.GetDisplayTitle();
@ -197,9 +198,6 @@ namespace osu.Game.Beatmaps
[JsonIgnore] [JsonIgnore]
IRulesetInfo IBeatmapInfo.Ruleset => Ruleset; IRulesetInfo IBeatmapInfo.Ruleset => Ruleset;
[JsonIgnore]
double IBeatmapInfo.StarRating => StarDifficulty;
#endregion #endregion
} }
} }

2
osu.Game/Beatmaps/BeatmapModelManager.cs
View File

@ -407,7 +407,7 @@ namespace osu.Game.Beatmaps
beatmap.BeatmapInfo.Ruleset = ruleset; beatmap.BeatmapInfo.Ruleset = ruleset;
// TODO: this should be done in a better place once we actually need to dynamically update it. // TODO: this should be done in a better place once we actually need to dynamically update it.
beatmap.BeatmapInfo.StarDifficulty = ruleset?.CreateInstance().CreateDifficultyCalculator(new DummyConversionBeatmap(beatmap)).Calculate().StarRating ?? 0; beatmap.BeatmapInfo.StarRating = ruleset?.CreateInstance().CreateDifficultyCalculator(new DummyConversionBeatmap(beatmap)).Calculate().StarRating ?? 0;
beatmap.BeatmapInfo.Length = calculateLength(beatmap); beatmap.BeatmapInfo.Length = calculateLength(beatmap);
beatmap.BeatmapInfo.BPM = 60000 / beatmap.GetMostCommonBeatLength(); beatmap.BeatmapInfo.BPM = 60000 / beatmap.GetMostCommonBeatLength();

2
osu.Game/Beatmaps/BeatmapSetInfo.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Beatmaps
/// <summary> /// <summary>
/// The maximum star difficulty of all beatmaps in this set. /// The maximum star difficulty of all beatmaps in this set.
/// </summary> /// </summary>
public double MaxStarDifficulty => Beatmaps?.Max(b => b.StarDifficulty) ?? 0; public double MaxStarDifficulty => Beatmaps?.Max(b => b.StarRating) ?? 0;
/// <summary> /// <summary>
/// The maximum playable length in milliseconds of all beatmaps in this set. /// The maximum playable length in milliseconds of all beatmaps in this set.

2
osu.Game/Beatmaps/DifficultyRecommender.cs
View File

@ -64,7 +64,7 @@ namespace osu.Game.Beatmaps
BeatmapInfo beatmapInfo = beatmaps.Where(b => b.Ruleset.Equals(r)).OrderBy(b => BeatmapInfo beatmapInfo = beatmaps.Where(b => b.Ruleset.Equals(r)).OrderBy(b =>
{ {
double difference = b.StarDifficulty - recommendation; double difference = b.StarRating - recommendation;
return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
}).FirstOrDefault(); }).FirstOrDefault();

2
osu.Game/Screens/Edit/Editor.cs
View File

@ -723,7 +723,7 @@ namespace osu.Game.Screens.Edit
if (difficultyItems.Count > 0) if (difficultyItems.Count > 0)
difficultyItems.Add(new EditorMenuItemSpacer()); difficultyItems.Add(new EditorMenuItemSpacer());
foreach (var beatmap in rulesetBeatmaps.OrderBy(b => b.StarDifficulty)) foreach (var beatmap in rulesetBeatmaps.OrderBy(b => b.StarRating))
difficultyItems.Add(createDifficultyMenuItem(beatmap)); difficultyItems.Add(createDifficultyMenuItem(beatmap));
} }

6
osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Screens.Select.Carousel
return; return;
} }
match &= !criteria.StarDifficulty.HasFilter || criteria.StarDifficulty.IsInRange(BeatmapInfo.StarDifficulty); match &= !criteria.StarDifficulty.HasFilter || criteria.StarDifficulty.IsInRange(BeatmapInfo.StarRating);
match &= !criteria.ApproachRate.HasFilter || criteria.ApproachRate.IsInRange(BeatmapInfo.BaseDifficulty.ApproachRate); match &= !criteria.ApproachRate.HasFilter || criteria.ApproachRate.IsInRange(BeatmapInfo.BaseDifficulty.ApproachRate);
match &= !criteria.DrainRate.HasFilter || criteria.DrainRate.IsInRange(BeatmapInfo.BaseDifficulty.DrainRate); match &= !criteria.DrainRate.HasFilter || criteria.DrainRate.IsInRange(BeatmapInfo.BaseDifficulty.DrainRate);
match &= !criteria.CircleSize.HasFilter || criteria.CircleSize.IsInRange(BeatmapInfo.BaseDifficulty.CircleSize); match &= !criteria.CircleSize.HasFilter || criteria.CircleSize.IsInRange(BeatmapInfo.BaseDifficulty.CircleSize);
@ -53,7 +53,7 @@ namespace osu.Game.Screens.Select.Carousel
match &= !criteria.Artist.HasFilter || criteria.Artist.Matches(BeatmapInfo.Metadata.Artist) || match &= !criteria.Artist.HasFilter || criteria.Artist.Matches(BeatmapInfo.Metadata.Artist) ||
criteria.Artist.Matches(BeatmapInfo.Metadata.ArtistUnicode); criteria.Artist.Matches(BeatmapInfo.Metadata.ArtistUnicode);
match &= !criteria.UserStarDifficulty.HasFilter || criteria.UserStarDifficulty.IsInRange(BeatmapInfo.StarDifficulty); match &= !criteria.UserStarDifficulty.HasFilter || criteria.UserStarDifficulty.IsInRange(BeatmapInfo.StarRating);
if (match) if (match)
{ {
@ -92,7 +92,7 @@ namespace osu.Game.Screens.Select.Carousel
int ruleset = BeatmapInfo.RulesetID.CompareTo(otherBeatmap.BeatmapInfo.RulesetID); int ruleset = BeatmapInfo.RulesetID.CompareTo(otherBeatmap.BeatmapInfo.RulesetID);
if (ruleset != 0) return ruleset; if (ruleset != 0) return ruleset;
return BeatmapInfo.StarDifficulty.CompareTo(otherBeatmap.BeatmapInfo.StarDifficulty); return BeatmapInfo.StarRating.CompareTo(otherBeatmap.BeatmapInfo.StarRating);
} }
} }

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

@ -84,7 +84,7 @@ namespace osu.Game.Screens.Select.Carousel
return compareUsingAggregateMax(otherSet, b => b.Length); return compareUsingAggregateMax(otherSet, b => b.Length);
case SortMode.Difficulty: case SortMode.Difficulty:
return compareUsingAggregateMax(otherSet, b => b.StarDifficulty); return compareUsingAggregateMax(otherSet, b => b.StarRating);
} }
} }

2
osu.Game/Tests/Visual/OsuTestScene.cs
View File

@ -228,7 +228,7 @@ namespace osu.Game.Tests.Visual
Checksum = beatmap.MD5Hash, Checksum = beatmap.MD5Hash,
AuthorID = beatmap.Metadata.Author.OnlineID, AuthorID = beatmap.Metadata.Author.OnlineID,
RulesetID = beatmap.RulesetID, RulesetID = beatmap.RulesetID,
StarRating = beatmap.StarDifficulty, StarRating = beatmap.StarRating,
DifficultyName = beatmap.Version, DifficultyName = beatmap.Version,
} }
} }