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

Add to/from database mapping functions to difficulty attributes

Browse Source
This commit is contained in:
Dan Balasescu 2021-11-15 16:06:46 +09:00
parent 907499f73a
commit 0cfd6fdf04
5 changed files with 107 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using Newtonsoft.Json;
using osu.Game.Rulesets.Difficulty;
@ -10,5 +11,25 @@ namespace osu.Game.Rulesets.Catch.Difficulty
{
[JsonProperty("approach_rate")]
public double ApproachRate { get; set; }
public override IEnumerable<(int attributeId, object value)> ToDatabase()
{
foreach (var v in base.ToDatabase())
yield return v;
// Todo: Catch should not output star rating in the 'aim' attribute.
yield return (1, StarRating);
yield return (7, ApproachRate);
yield return (9, MaxCombo);
}
public override void FromDatabase(IReadOnlyDictionary<int, double> values, int hitCircleCount, int spinnerCount)
{
base.FromDatabase(values, hitCircleCount, spinnerCount);
StarRating = values[1];
ApproachRate = values[7];
MaxCombo = (int)values[9];
}
}
}

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

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using Newtonsoft.Json;
using osu.Game.Rulesets.Difficulty;
@ -13,5 +14,25 @@ namespace osu.Game.Rulesets.Mania.Difficulty
[JsonProperty("score_multiplier")]
public double ScoreMultiplier { get; set; }
public override IEnumerable<(int attributeId, object value)> ToDatabase()
{
foreach (var v in base.ToDatabase())
yield return v;
// Todo: Mania doesn't output MaxCombo attribute for some reason.
yield return (11, StarRating);
yield return (13, GreatHitWindow);
yield return (15, ScoreMultiplier);
}
public override void FromDatabase(IReadOnlyDictionary<int, double> values, int hitCircleCount, int spinnerCount)
{
base.FromDatabase(values, hitCircleCount, spinnerCount);
StarRating = values[11];
GreatHitWindow = values[13];
ScoreMultiplier = values[15];
}
}
}

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

@ -1,8 +1,11 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using System.Linq;
using Newtonsoft.Json;
using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Mods;
namespace osu.Game.Rulesets.Osu.Difficulty
{
@ -37,5 +40,39 @@ namespace osu.Game.Rulesets.Osu.Difficulty
[JsonProperty("spinner_count")]
public int SpinnerCount { get; set; }
public override IEnumerable<(int attributeId, object value)> ToDatabase()
{
foreach (var v in base.ToDatabase())
yield return v;
yield return (1, AimStrain);
yield return (3, SpeedStrain);
yield return (5, OverallDifficulty);
yield return (7, ApproachRate);
yield return (9, MaxCombo);
yield return (11, StarRating);
if (Mods.Any(m => m is ModFlashlight))
yield return (17, FlashlightRating);
yield return (19, SliderFactor);
}
public override void FromDatabase(IReadOnlyDictionary<int, double> values, int hitCircleCount, int spinnerCount)
{
base.FromDatabase(values, hitCircleCount, spinnerCount);
AimStrain = values[1];
SpeedStrain = values[3];
OverallDifficulty = values[5];
ApproachRate = values[7];
MaxCombo = (int)values[9];
StarRating = values[11];
FlashlightRating = values.GetValueOrDefault(17);
SliderFactor = values[19];
HitCircleCount = hitCircleCount;
SpinnerCount = spinnerCount;
}
}
}

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

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using Newtonsoft.Json;
using osu.Game.Rulesets.Difficulty;
@ -22,5 +23,24 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
[JsonProperty("great_hit_window")]
public double GreatHitWindow { get; set; }
public override IEnumerable<(int attributeId, object value)> ToDatabase()
{
foreach (var v in base.ToDatabase())
yield return v;
yield return (9, MaxCombo);
yield return (11, StarRating);
yield return (13, GreatHitWindow);
}
public override void FromDatabase(IReadOnlyDictionary<int, double> values, int hitCircleCount, int spinnerCount)
{
base.FromDatabase(values, hitCircleCount, spinnerCount);
MaxCombo = (int)values[9];
StarRating = values[11];
GreatHitWindow = values[13];
}
}
}

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

@ -1,6 +1,8 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using System.Linq;
using Newtonsoft.Json;
using osu.Game.Rulesets.Difficulty.Skills;
using osu.Game.Rulesets.Mods;
@ -31,5 +33,11 @@ namespace osu.Game.Rulesets.Difficulty
Skills = skills;
StarRating = starRating;
}
public virtual IEnumerable<(int attributeId, object value)> ToDatabase() => Enumerable.Empty<(int, object)>();
public virtual void FromDatabase(IReadOnlyDictionary<int, double> values, int hitCircleCount, int spinnerCount)
{
}
}
}