Remove extra members from FromDatabaseAttributes

This commit is contained in:
Dan Balasescu
2021-11-15 18:11:07 +09:00
parent 21c0882b74
commit c8a01c35f7
5 changed files with 18 additions and 20 deletions

View File

@ -12,9 +12,9 @@ namespace osu.Game.Rulesets.Catch.Difficulty
[JsonProperty("approach_rate")]
public double ApproachRate { get; set; }
public override IEnumerable<(int attributeId, object value)> ToDatabase()
public override IEnumerable<(int attributeId, object value)> ToDatabaseAttributes()
{
foreach (var v in base.ToDatabase())
foreach (var v in base.ToDatabaseAttributes())
yield return v;
// Todo: Catch should not output star rating in the 'aim' attribute.
@ -23,9 +23,9 @@ namespace osu.Game.Rulesets.Catch.Difficulty
yield return (9, MaxCombo);
}
public override void FromDatabase(IReadOnlyDictionary<int, double> values, int hitCircleCount, int spinnerCount)
public override void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values)
{
base.FromDatabase(values, hitCircleCount, spinnerCount);
base.FromDatabaseAttributes(values);
StarRating = values[1];
ApproachRate = values[7];