h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-04 17:03:57 +08:00
Code Issues Releases Wiki Activity

Write out DifficultyControlPoints into HitObjects

Browse Source
This commit is contained in:
Dean Herbert
2021-08-31 16:16:53 +09:00
Unverified
parent cdd0262ca1
commit b41b1e2394
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Rulesets/Objects/HitObject.cs
+4
View File
@@ -68,6 +68,8 @@ namespace osu.Game.Rulesets.Objects
public SampleControlPoint SampleControlPoint;
public DifficultyControlPoint DifficultyControlPoint;
/// <summary>
/// Whether this <see cref="HitObject"/> is in Kiai time.
/// </summary>
@@ -110,10 +112,12 @@ namespace osu.Game.Rulesets.Objects
{
// This is done here since ApplyDefaultsToSelf may be used to determine the end time
SampleControlPoint = legacyInfo.SamplePointAt(this.GetEndTime() + control_point_leniency);
DifficultyControlPoint = legacyInfo.DifficultyPointAt(StartTime);
}
else
{
SampleControlPoint ??= SampleControlPoint.DEFAULT;
DifficultyControlPoint ??= DifficultyControlPoint.DEFAULT;
}
nestedHitObjects.Clear();
osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+1 -2
View File
@@ -43,9 +43,8 @@ namespace osu.Game.Rulesets.Objects.Legacy
base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
DifficultyControlPoint difficultyPoint = controlPointInfo.DifficultyPointAt(StartTime);
double scoringDistance = base_scoring_distance * difficulty.SliderMultiplier * difficultyPoint.SpeedMultiplier;
double scoringDistance = base_scoring_distance * difficulty.SliderMultiplier * DifficultyControlPoint.SpeedMultiplier;
Velocity = scoringDistance / timingPoint.BeatLength;
}