make HP and OD generic and instantiate CS and AR to modes that need it

This commit is contained in:
unknown
2019-12-22 16:45:32 +08:00
parent 0eef218945
commit fe73b9f8d3
5 changed files with 68 additions and 103 deletions

View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Bindables;
using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.Rulesets.Mods;
@ -9,18 +10,8 @@ namespace osu.Game.Rulesets.Catch.Mods
{
public class CatchModDifficultyAdjust : ModDifficultyAdjust
{
[SettingSource("Drain Rate", "Override a beatmap's set HP.")]
public override BindableNumber<float> DrainRate { get; } = new BindableFloat()
{
Precision = 0.1f,
MinValue = 1,
MaxValue = 10,
Default = 5,
Value = 5,
};
[SettingSource("Fruit Size", "Override a beatmap's set CS.")]
public override BindableNumber<float> CircleSize { get; } = new BindableFloat()
public BindableNumber<float> CircleSize { get; } = new BindableFloat()
{
Precision = 0.1f,
MinValue = 1,
@ -30,7 +21,7 @@ namespace osu.Game.Rulesets.Catch.Mods
};
[SettingSource("Approach Rate", "Override a beatmap's set AR.")]
public override BindableNumber<float> ApproachRate { get; } = new BindableFloat()
public BindableNumber<float> ApproachRate { get; } = new BindableFloat()
{
Precision = 0.1f,
MinValue = 1,
@ -39,14 +30,20 @@ namespace osu.Game.Rulesets.Catch.Mods
Value = 5,
};
[SettingSource("Overall Difficulty", "Override a beatmap's set OD.")]
public override BindableNumber<float> OverallDifficulty { get; } = new BindableFloat()
protected override void UpdateSettings(BeatmapDifficulty difficulty)
{
Precision = 0.1f,
MinValue = 1,
MaxValue = 10,
Default = 5,
Value = 5,
};
base.UpdateSettings(difficulty);
CircleSize.Value = CircleSize.Default = difficulty.CircleSize;
ApproachRate.Value = ApproachRate.Default = difficulty.ApproachRate;
}
protected override void ApplySettings(BeatmapDifficulty difficulty)
{
base.ApplySettings(difficulty);
difficulty.CircleSize = CircleSize.Value;
difficulty.ApproachRate = ApproachRate.Value;
}
}
}