sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects 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
Download Patch File Download Diff File Expand all files Collapse all files

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

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