h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 20:12:57 +08:00
Code Issues Releases Wiki Activity

General fixes.

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