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

Standardise variables

Browse Source
This commit is contained in:
Dean Herbert 2021-07-09 13:24:26 +09:00
parent b7803b889e
commit 90326f8864
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Catch.Mods
MinValue = 1,
MaxValue = 10,
ExtendedMaxValue = 11,
ReadFromDifficulty = diff => diff.CircleSize,
ReadCurrentFromDifficulty = diff => diff.CircleSize,
};
[SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1)]
@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Catch.Mods
MinValue = 1,
MaxValue = 10,
ExtendedMaxValue = 11,
ReadFromDifficulty = diff => diff.ApproachRate,
ReadCurrentFromDifficulty = diff => diff.ApproachRate,
};
[SettingSource("Spicy Patterns", "Adjust the patterns as if Hard Rock is enabled.")]

4
osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Mods
MinValue = 0,
MaxValue = 10,
ExtendedMaxValue = 11,
ReadFromDifficulty = diff => diff.CircleSize,
ReadCurrentFromDifficulty = diff => diff.CircleSize,
};
[SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1, SettingControlType = typeof(DifficultyAdjustSettingsControl))]
@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Mods
MinValue = 0,
MaxValue = 10,
ExtendedMaxValue = 11,
ReadFromDifficulty = diff => diff.ApproachRate,
ReadCurrentFromDifficulty = diff => diff.ApproachRate,
};
public override string SettingDescription

2
osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
Precision = 0.05f,
MinValue = 0.25f,
MaxValue = 4,
ReadFromDifficulty = _ => 1,
ReadCurrentFromDifficulty = _ => 1,
};
public override string SettingDescription

2
osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
View File

@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Mods
{
// ensure the beatmap's value is not transferred as a user override.
isInternalChange = true;
displayNumber.Value = difficultyBindable.ReadFromDifficulty(difficulty);
displayNumber.Value = difficultyBindable.ReadCurrentFromDifficulty(difficulty);
isInternalChange = false;
}
}

4
osu.Game/Rulesets/Mods/DifficultyBindable.cs
View File

@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mods
/// <summary>
/// Whether the extended limits should be applied to this bindable.
/// </summary>
public BindableBool ExtendedLimits { get; } = new BindableBool();
public readonly BindableBool ExtendedLimits = new BindableBool();
/// <summary>
/// An internal numeric bindable to hold and propagate min/max/precision.
@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mods
/// <summary>
/// A function that can extract the current value of this setting from a beatmap difficulty for display purposes.
/// </summary>
public Func<BeatmapDifficulty, float> ReadFromDifficulty;
public Func<BeatmapDifficulty, float> ReadCurrentFromDifficulty;
public float Precision
{

4
osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Mods
MinValue = 0,
MaxValue = 10,
ExtendedMaxValue = 11,
ReadFromDifficulty = diff => diff.DrainRate,
ReadCurrentFromDifficulty = diff => diff.DrainRate,
};
[SettingSource("Accuracy", "Override a beatmap's set OD.", LAST_SETTING_ORDER, SettingControlType = typeof(DifficultyAdjustSettingsControl))]
@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Mods
MinValue = 0,
MaxValue = 10,
ExtendedMaxValue = 11,
ReadFromDifficulty = diff => diff.OverallDifficulty,
ReadCurrentFromDifficulty = diff => diff.OverallDifficulty,
};
[SettingSource("Extended Limits", "Adjust difficulty beyond sane limits.")]