sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-20 21:17:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add back autogeneration rules

Browse Source 
Will be removed in https://github.com/ppy/osu/pull/6604
This commit is contained in:
Dean Herbert 2019-10-26 10:25:13 +09:00
parent 7100319858
commit d6a49b9e93
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Beatmaps/ControlPoints/ControlPointGroup.cs
View File

@ -30,10 +30,19 @@ namespace osu.Game.Beatmaps.ControlPoints
public void Add(ControlPoint point) public void Add(ControlPoint point)
{ {
point.AttachGroup(this); var existing = controlPoints.FirstOrDefault(p => p.GetType() == point.GetType());
if (existing != null)
{
// autogenerated points should not replace non-autogenerated.
// this allows for incorrectly ordered timing points to still be correctly handled.
if (point.AutoGenerated && !existing.AutoGenerated)
return;
foreach (var existing in controlPoints.Where(p => p.GetType() == point.GetType()).ToArray())
Remove(existing); Remove(existing);
}
point.AttachGroup(this);
controlPoints.Add(point); controlPoints.Add(point);
ItemAdded?.Invoke(point); ItemAdded?.Invoke(point);

3
osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
View File

@ -184,9 +184,6 @@ namespace osu.Game.Beatmaps.ControlPoints
public void Add(double time, ControlPoint newPoint, bool force = false) public void Add(double time, ControlPoint newPoint, bool force = false)
{ {
if (!force && SimilarPointAt(time, newPoint)?.EquivalentTo(newPoint) == true)
return;
GroupAt(time, true).Add(newPoint); GroupAt(time, true).Add(newPoint);
} }

6
osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
View File

@ -374,14 +374,12 @@ namespace osu.Game.Beatmaps.Formats
beatmap.ControlPointInfo.Add(time, controlPoint); beatmap.ControlPointInfo.Add(time, controlPoint);
} }
else
{
beatmap.ControlPointInfo.Add(time, new DifficultyControlPoint beatmap.ControlPointInfo.Add(time, new DifficultyControlPoint
{ {
SpeedMultiplier = speedMultiplier, SpeedMultiplier = speedMultiplier,
AutoGenerated = false AutoGenerated = timingChange
}); });
}
beatmap.ControlPointInfo.Add(time, new EffectControlPoint beatmap.ControlPointInfo.Add(time, new EffectControlPoint
{ {