h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 22:33:05 +08:00
Code Issues Releases Wiki Activity

Remove extra members from FromDatabaseAttributes

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyAttributes.cs
View File

@ -12,9 +12,9 @@ namespace osu.Game.Rulesets.Catch.Difficulty
[JsonProperty("approach_rate")] [JsonProperty("approach_rate")]
public double ApproachRate { get; set; } 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; yield return v;
// Todo: Catch should not output star rating in the 'aim' attribute. // 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); 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]; StarRating = values[1];
ApproachRate = values[7]; ApproachRate = values[7];

8
osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyAttributes.cs
View File

@ -15,9 +15,9 @@ namespace osu.Game.Rulesets.Mania.Difficulty
[JsonProperty("score_multiplier")] [JsonProperty("score_multiplier")]
public double ScoreMultiplier { get; set; } public double ScoreMultiplier { 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; yield return v;
// Todo: Mania doesn't output MaxCombo attribute for some reason. // Todo: Mania doesn't output MaxCombo attribute for some reason.
@ -26,9 +26,9 @@ namespace osu.Game.Rulesets.Mania.Difficulty
yield return (15, ScoreMultiplier); yield return (15, ScoreMultiplier);
} }
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[11]; StarRating = values[11];
GreatHitWindow = values[13]; GreatHitWindow = values[13];

10
osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
View File

@ -42,9 +42,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
[JsonIgnore] [JsonIgnore]
public int SpinnerCount { get; set; } public int SpinnerCount { 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; yield return v;
yield return (1, AimStrain); yield return (1, AimStrain);
@ -60,9 +60,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
yield return (19, SliderFactor); yield return (19, SliderFactor);
} }
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);
AimStrain = values[1]; AimStrain = values[1];
SpeedStrain = values[3]; SpeedStrain = values[3];
@ -72,8 +72,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
StarRating = values[11]; StarRating = values[11];
FlashlightRating = values.GetValueOrDefault(17); FlashlightRating = values.GetValueOrDefault(17);
SliderFactor = values[19]; SliderFactor = values[19];
HitCircleCount = hitCircleCount;
SpinnerCount = spinnerCount;
} }
[UsedImplicitly] [UsedImplicitly]

8
osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs
View File

@ -24,9 +24,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
[JsonProperty("great_hit_window")] [JsonProperty("great_hit_window")]
public double GreatHitWindow { get; set; } public double GreatHitWindow { 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; yield return v;
yield return (9, MaxCombo); yield return (9, MaxCombo);
@ -34,9 +34,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
yield return (13, GreatHitWindow); yield return (13, GreatHitWindow);
} }
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);
MaxCombo = (int)values[9]; MaxCombo = (int)values[9];
StarRating = values[11]; StarRating = values[11];

4
osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
View File

@ -34,9 +34,9 @@ namespace osu.Game.Rulesets.Difficulty
StarRating = starRating; StarRating = starRating;
} }
public virtual IEnumerable<(int attributeId, object value)> ToDatabase() => Enumerable.Empty<(int, object)>(); public virtual IEnumerable<(int attributeId, object value)> ToDatabaseAttributes() => Enumerable.Empty<(int, object)>();
public virtual void FromDatabase(IReadOnlyDictionary<int, double> values, int hitCircleCount, int spinnerCount) public virtual void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values)
{ {
} }
} }