RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

General fixes.

This commit is contained in:
smoogipooo 2017-05-18 13:37:22 +09:00
parent c1a44ea6b4
commit 7c48fb2b92
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Rulesets.Mania/Beatmaps/DistanceObjectConversion.cs
View File

@ -126,7 +126,6 @@ private ObjectList generateRandomHoldNotes(double startTime, double endTime, int
var newObjects = new ObjectList();
int usableColumns = AvailableColumns - RandomStart - PreviousObjects.ColumnsFilled;
int nextColumn = Random.Next(RandomStart, AvailableColumns);
for (int i = 0; i < Math.Min(usableColumns, noteCount); i++)
{
@ -325,7 +324,7 @@ private ObjectList generateNRandomNotes(double startTime, double endTime, double
canGenerateTwoNotes &= originalObject.Samples.Any(isDoubleSample) || sampleInfoListAt(originalObject.StartTime).Any(isDoubleSample);
if (canGenerateTwoNotes)
p2 = 0;
p2 = 1;
return generateRandomHoldNotes(startTime, endTime, GetRandomNoteCount(p2, p3, p4));
}
@ -397,7 +396,7 @@ private ObjectList generateHoldAndNormalNotes(double startTime, double separatio
// Create the hold note
add(newObjects, holdColumn, startTime, separationTime * repeatCount);
int noteCount = 0;
int noteCount = 1;
if (conversionDifficulty > 6.5)
noteCount = GetRandomNoteCount(0.63, 0);
else if (conversionDifficulty > 4)
@ -422,10 +421,9 @@ private ObjectList generateHoldAndNormalNotes(double startTime, double separatio
}
}
foreach (ManiaHitObject obj in tempObjects.HitObjects)
newObjects.Add(obj);
newObjects.Add(tempObjects);
tempObjects.Clear();
startTime += separationTime;
}