h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 06:42:56 +08:00
Code Issues Releases Wiki Activity

Fix difficulty calculation using the pre-mod catcher size

Browse Source
This commit is contained in:
smoogipoo 2019-03-19 15:35:14 +09:00
parent 4031cad4f8
commit 5d9477e1e4
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,11 +23,17 @@ namespace osu.Game.Rulesets.Catch.Difficulty
protected override int SectionLength => 750; protected override int SectionLength => 750;
private readonly float halfCatchWidth; private float halfCatchWidth;
public CatchDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap) public CatchDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
: base(ruleset, beatmap) : base(ruleset, beatmap)
{ {
}
protected override void PreProcess(IBeatmap beatmap, Mod[] mods, double clockRate)
{
base.PreProcess(beatmap, mods, clockRate);
var catcher = new CatcherArea.Catcher(beatmap.BeatmapInfo.BaseDifficulty); var catcher = new CatcherArea.Catcher(beatmap.BeatmapInfo.BaseDifficulty);
halfCatchWidth = catcher.CatchWidth * 0.5f; halfCatchWidth = catcher.CatchWidth * 0.5f;

9
osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
View File

@ -63,6 +63,8 @@ namespace osu.Game.Rulesets.Difficulty
private DifficultyAttributes calculate(IBeatmap beatmap, Mod[] mods, double clockRate) private DifficultyAttributes calculate(IBeatmap beatmap, Mod[] mods, double clockRate)
{ {
PreProcess(beatmap, mods, clockRate);
var skills = CreateSkills(beatmap); var skills = CreateSkills(beatmap);
if (!beatmap.HitObjects.Any()) if (!beatmap.HitObjects.Any())
@ -99,6 +101,13 @@ namespace osu.Game.Rulesets.Difficulty
return CreateDifficultyAttributes(beatmap, mods, skills, clockRate); return CreateDifficultyAttributes(beatmap, mods, skills, clockRate);
} }
/// <summary>
/// Computes any values to be used for difficulty calculation, prior to difficulty calculation taking place.
/// </summary>
protected virtual void PreProcess(IBeatmap beatmap, Mod[] mods, double clockRate)
{
}
/// <summary> /// <summary>
/// Creates all <see cref="Mod"/> combinations which adjust the <see cref="Beatmap"/> difficulty. /// Creates all <see cref="Mod"/> combinations which adjust the <see cref="Beatmap"/> difficulty.
/// </summary> /// </summary>