mirror of
https://github.com/ppy/osu
synced 2024-12-13 10:28:17 +00:00
323e4ac26b
In catch, rate adjustment mods do not only affect the timings of hitobjects, but also the speed of the player's catcher. This catcher speed change has an impact on difficulty which is currently accounted for by using the clockrate directly in calculations. Semantically this is a bad idea because clockrate adjustments are supposed to be fully accounted for in DifficultyHitObjects, but passing clockrate here for the purpose of being used as catcher speed doesn't make much sense, especially since it is copied in every DifficultyHitObject despite being the same value. It makes more sense to account for this catch specific impact by handling rate adjustment mods in a catch specific way, or more specifically in a Movement skill specific way.
41 lines
1.7 KiB
C#
41 lines
1.7 KiB
C#
// 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;
|
|
using osu.Game.Rulesets.Catch.Objects;
|
|
using osu.Game.Rulesets.Difficulty.Preprocessing;
|
|
using osu.Game.Rulesets.Objects;
|
|
|
|
namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
|
|
{
|
|
public class CatchDifficultyHitObject : DifficultyHitObject
|
|
{
|
|
private const float normalized_hitobject_radius = 41.0f;
|
|
|
|
public new PalpableCatchHitObject BaseObject => (PalpableCatchHitObject)base.BaseObject;
|
|
|
|
public new PalpableCatchHitObject LastObject => (PalpableCatchHitObject)base.LastObject;
|
|
|
|
public readonly float NormalizedPosition;
|
|
public readonly float LastNormalizedPosition;
|
|
|
|
/// <summary>
|
|
/// Milliseconds elapsed since the start time of the previous <see cref="CatchDifficultyHitObject"/>, with a minimum of 40ms.
|
|
/// </summary>
|
|
public readonly double StrainTime;
|
|
|
|
public CatchDifficultyHitObject(HitObject hitObject, HitObject lastObject, double clockRate, float halfCatcherWidth)
|
|
: base(hitObject, lastObject, clockRate)
|
|
{
|
|
// We will scale everything by this factor, so we can assume a uniform CircleSize among beatmaps.
|
|
var scalingFactor = normalized_hitobject_radius / halfCatcherWidth;
|
|
|
|
NormalizedPosition = BaseObject.EffectiveX * scalingFactor;
|
|
LastNormalizedPosition = LastObject.EffectiveX * scalingFactor;
|
|
|
|
// Every strain interval is hard capped at the equivalent of 375 BPM streaming speed as a safety measure
|
|
StrainTime = Math.Max(40, DeltaTime);
|
|
}
|
|
}
|
|
}
|