h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-05 23:32:56 +08:00
Code Issues Releases Wiki Activity

Remove siblings.

Browse Source
This commit is contained in:
smoogipooo 2017-05-22 10:30:03 +09:00
parent 6c0d226459
commit dba9dd3509
1 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
View File

@ -94,11 +94,9 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
// Generate a new pattern by copying the last hit objects in reverse-column order // Generate a new pattern by copying the last hit objects in reverse-column order
var pattern = new Pattern(); var pattern = new Pattern();
int siblings = PreviousPattern.HitObjects.Count(h => h.Column >= RandomStart);
for (int i = RandomStart; i < AvailableColumns; i++) for (int i = RandomStart; i < AvailableColumns; i++)
if (PreviousPattern.IsFilled(i)) if (PreviousPattern.IsFilled(i))
addToPattern(pattern, RandomStart + AvailableColumns - i - 1, siblings); addToPattern(pattern, RandomStart + AvailableColumns - i - 1);
return pattern; return pattern;
} }
@ -123,11 +121,9 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
// Generate a new pattern by placing on the already filled columns // Generate a new pattern by placing on the already filled columns
var pattern = new Pattern(); var pattern = new Pattern();
int siblings = PreviousPattern.HitObjects.Count(h => h.Column >= RandomStart);
for (int i = RandomStart; i < AvailableColumns; i++) for (int i = RandomStart; i < AvailableColumns; i++)
if (PreviousPattern.IsFilled(i)) if (PreviousPattern.IsFilled(i))
addToPattern(pattern, i, siblings); addToPattern(pattern, i);
return pattern; return pattern;
} }
@ -208,9 +204,8 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
/// </para> /// </para>
/// </summary> /// </summary>
/// <param name="noteCount">The amount of notes to generate.</param> /// <param name="noteCount">The amount of notes to generate.</param>
/// <param name="siblingsOverride">Custom siblings count if <paramref name="noteCount"/> is not the number of siblings in this pattern.</param>
/// <returns>The <see cref="Pattern"/> containing the hit objects.</returns> /// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
private Pattern generateRandomNotes(int noteCount, int siblingsOverride = -1) private Pattern generateRandomNotes(int noteCount)
{ {
var pattern = new Pattern(); var pattern = new Pattern();
@ -234,7 +229,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
nextColumn = Random.Next(RandomStart, AvailableColumns); nextColumn = Random.Next(RandomStart, AvailableColumns);
} }
addToPattern(pattern, nextColumn, siblingsOverride != -1 ? siblingsOverride : noteCount); addToPattern(pattern, nextColumn);
} }
return pattern; return pattern;
@ -257,16 +252,10 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
{ {
var pattern = new Pattern(); var pattern = new Pattern();
int noteCount = getRandomNoteCount(p2, p3, p4, p5); pattern.Add(generateRandomNotes(getRandomNoteCount(p2, p3, p4, p5)));
int siblings = noteCount;
if (RandomStart > 0 && hasSpecialColumn) if (RandomStart > 0 && hasSpecialColumn)
{ addToPattern(pattern, 0);
siblings++;
addToPattern(pattern, 0, siblings);
}
pattern.Add(generateRandomNotes(noteCount, siblings));
return pattern; return pattern;
} }
@ -284,12 +273,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
bool addToCentre; bool addToCentre;
int noteCount = getRandomNoteCountMirrored(centreProbability, p2, p3, out addToCentre); int noteCount = getRandomNoteCountMirrored(centreProbability, p2, p3, out addToCentre);
int siblings = noteCount;
if (addToCentre)
siblings++;
if (RandomStart > 0 && hasSpecialColumn)
siblings++;
int columnLimit = (AvailableColumns % 2 == 0 ? AvailableColumns : AvailableColumns - 1) / 2; int columnLimit = (AvailableColumns % 2 == 0 ? AvailableColumns : AvailableColumns - 1) / 2;
int nextColumn = Random.Next(RandomStart, columnLimit); int nextColumn = Random.Next(RandomStart, columnLimit);
@ -297,17 +280,18 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
{ {
while (pattern.IsFilled(nextColumn)) while (pattern.IsFilled(nextColumn))
nextColumn = Random.Next(RandomStart, columnLimit); nextColumn = Random.Next(RandomStart, columnLimit);
// Add normal note // Add normal note
addToPattern(pattern, nextColumn, siblings); addToPattern(pattern, nextColumn);
// Add mirrored note // Add mirrored note
addToPattern(pattern, RandomStart + AvailableColumns - nextColumn - 1); addToPattern(pattern, RandomStart + AvailableColumns - nextColumn - 1);
} }
if (addToCentre) if (addToCentre)
addToPattern(pattern, AvailableColumns / 2, siblings); addToPattern(pattern, AvailableColumns / 2);
if (RandomStart > 0 && hasSpecialColumn) if (RandomStart > 0 && hasSpecialColumn)
addToPattern(pattern, 0, siblings); addToPattern(pattern, 0);
return pattern; return pattern;
} }
@ -410,15 +394,13 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
/// </summary> /// </summary>
/// <param name="pattern">The pattern to add to.</param> /// <param name="pattern">The pattern to add to.</param>
/// <param name="column">The column to add the note to.</param> /// <param name="column">The column to add the note to.</param>
/// <param name="siblings">The number of children alongside this note (these will not be generated, but are used for volume calculations).</param> private void addToPattern(Pattern pattern, int column)
private void addToPattern(Pattern pattern, int column, int siblings = 1)
{ {
pattern.Add(new Note pattern.Add(new Note
{ {
StartTime = HitObject.StartTime, StartTime = HitObject.StartTime,
Samples = HitObject.Samples, Samples = HitObject.Samples,
Column = column, Column = column
Siblings = siblings
}); });
} }
} }