mirror of
https://github.com/osukey/osukey.git
synced 2025-07-02 16:59:53 +09:00
Remove distance object pattern generator for now (next PR).
This commit is contained in:
smoogipooo
@ -4,8 +4,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using osu.Game.Beatmaps;
|
using osu.Game.Beatmaps;
|
||||||
using osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy;
|
|
||||||
using osu.Game.Rulesets.Mania.MathUtils;
|
|
||||||
using osu.Game.Rulesets.Mania.Objects;
|
using osu.Game.Rulesets.Mania.Objects;
|
||||||
using osu.Game.Rulesets.Objects;
|
using osu.Game.Rulesets.Objects;
|
||||||
using osu.Game.Rulesets.Objects.Types;
|
using osu.Game.Rulesets.Objects.Types;
|
||||||
@ -18,10 +16,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
internal class LegacyBeatmapConverter
|
internal class LegacyBeatmapConverter
|
||||||
{
|
{
|
||||||
private readonly FastRandom random;
|
|
||||||
|
|
||||||
private Patterns.Pattern lastPattern = new Patterns.Pattern();
|
|
||||||
|
|
||||||
private readonly int availableColumns;
|
private readonly int availableColumns;
|
||||||
private readonly float localXDivisor;
|
private readonly float localXDivisor;
|
||||||
|
|
||||||
@ -31,10 +25,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
|
|||||||
{
|
{
|
||||||
this.beatmap = beatmap;
|
this.beatmap = beatmap;
|
||||||
|
|
||||||
int seed = (int)Math.Round(beatmap.BeatmapInfo.Difficulty.DrainRate + beatmap.BeatmapInfo.Difficulty.CircleSize)
|
|
||||||
* 20 + (int)(beatmap.BeatmapInfo.Difficulty.OverallDifficulty * 41.2) + (int)Math.Round(beatmap.BeatmapInfo.Difficulty.ApproachRate);
|
|
||||||
random = new FastRandom(seed);
|
|
||||||
|
|
||||||
availableColumns = (int)Math.Round(beatmap.BeatmapInfo.Difficulty.CircleSize);
|
availableColumns = (int)Math.Round(beatmap.BeatmapInfo.Difficulty.CircleSize);
|
||||||
localXDivisor = 512.0f / availableColumns;
|
localXDivisor = 512.0f / availableColumns;
|
||||||
}
|
}
|
||||||
@ -97,7 +87,9 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
|
|||||||
Patterns.PatternGenerator conversion = null;
|
Patterns.PatternGenerator conversion = null;
|
||||||
|
|
||||||
if (distanceData != null)
|
if (distanceData != null)
|
||||||
conversion = new DistanceObjectPatternGenerator(random, original, beatmap, lastPattern);
|
{
|
||||||
|
// Slider
|
||||||
|
}
|
||||||
else if (endTimeData != null)
|
else if (endTimeData != null)
|
||||||
{
|
{
|
||||||
// Spinner
|
// Spinner
|
||||||
@ -114,8 +106,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
|
|||||||
|
|
||||||
foreach (ManiaHitObject obj in newPattern.HitObjects)
|
foreach (ManiaHitObject obj in newPattern.HitObjects)
|
||||||
yield return obj;
|
yield return obj;
|
||||||
|
|
||||||
lastPattern = newPattern;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private int getColumn(float position) => MathHelper.Clamp((int)Math.Floor(position / localXDivisor), 0, availableColumns - 1);
|
private int getColumn(float position) => MathHelper.Clamp((int)Math.Floor(position / localXDivisor), 0, availableColumns - 1);
|
||||||
|
|||||||
@ -1,463 +0,0 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Linq;
|
|
||||||
using osu.Game.Audio;
|
|
||||||
using osu.Game.Beatmaps;
|
|
||||||
using osu.Game.Beatmaps.Timing;
|
|
||||||
using osu.Game.Rulesets.Mania.MathUtils;
|
|
||||||
using osu.Game.Rulesets.Objects;
|
|
||||||
using osu.Game.Rulesets.Objects.Types;
|
|
||||||
|
|
||||||
namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// A pattern generator for IHasDistance hit objects.
|
|
||||||
/// </summary>
|
|
||||||
internal class DistanceObjectPatternGenerator : PatternGenerator
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Base osu! slider scoring distance.
|
|
||||||
/// </summary>
|
|
||||||
private const float osu_base_scoring_distance = 100;
|
|
||||||
|
|
||||||
private readonly double endTime;
|
|
||||||
private readonly int repeatCount;
|
|
||||||
|
|
||||||
private PatternType convertType;
|
|
||||||
|
|
||||||
public DistanceObjectPatternGenerator(FastRandom random, HitObject hitObject, Beatmap beatmap, Pattern previousPattern)
|
|
||||||
: base(random, hitObject, beatmap, previousPattern)
|
|
||||||
{
|
|
||||||
ControlPoint overridePoint;
|
|
||||||
ControlPoint controlPoint = Beatmap.TimingInfo.TimingPointAt(hitObject.StartTime, out overridePoint);
|
|
||||||
|
|
||||||
convertType = PatternType.None;
|
|
||||||
if ((overridePoint ?? controlPoint)?.KiaiMode == false)
|
|
||||||
convertType = PatternType.LowProbability;
|
|
||||||
|
|
||||||
var distanceData = hitObject as IHasDistance;
|
|
||||||
var repeatsData = hitObject as IHasRepeats;
|
|
||||||
|
|
||||||
repeatCount = repeatsData?.RepeatCount ?? 1;
|
|
||||||
|
|
||||||
double speedAdjustment = beatmap.TimingInfo.SpeedMultiplierAt(hitObject.StartTime);
|
|
||||||
double speedAdjustedBeatLength = beatmap.TimingInfo.BeatLengthAt(hitObject.StartTime) * speedAdjustment;
|
|
||||||
|
|
||||||
// The true distance, accounting for any repeats. This ends up being the drum roll distance later
|
|
||||||
double distance = distanceData.Distance * repeatCount;
|
|
||||||
|
|
||||||
// The velocity of the osu! hit object - calculated as the velocity of a slider
|
|
||||||
double osuVelocity = osu_base_scoring_distance * beatmap.BeatmapInfo.Difficulty.SliderMultiplier / speedAdjustedBeatLength;
|
|
||||||
// The duration of the osu! hit object
|
|
||||||
double osuDuration = distance / osuVelocity;
|
|
||||||
|
|
||||||
endTime = hitObject.StartTime + osuDuration;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Pattern Generate()
|
|
||||||
{
|
|
||||||
double segmentDuration = endTime / repeatCount;
|
|
||||||
|
|
||||||
if (repeatCount > 1)
|
|
||||||
{
|
|
||||||
if (segmentDuration <= 90)
|
|
||||||
return generateRandomHoldNotes(HitObject.StartTime, endTime, 1);
|
|
||||||
|
|
||||||
if (segmentDuration <= 120)
|
|
||||||
{
|
|
||||||
convertType |= PatternType.ForceNotStack;
|
|
||||||
return generateRandomNotes(HitObject.StartTime, segmentDuration, repeatCount);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (segmentDuration <= 160)
|
|
||||||
return generateStair(HitObject.StartTime, segmentDuration);
|
|
||||||
|
|
||||||
if (segmentDuration <= 200 && ConversionDifficulty > 3)
|
|
||||||
return generateRandomMultipleNotes(HitObject.StartTime, segmentDuration, repeatCount);
|
|
||||||
|
|
||||||
double duration = endTime - HitObject.StartTime;
|
|
||||||
if (duration >= 4000)
|
|
||||||
return generateNRandomNotes(HitObject.StartTime, endTime, 0.23, 0, 0);
|
|
||||||
|
|
||||||
if (segmentDuration > 400 && duration < 4000 && repeatCount < AvailableColumns - 1 - RandomStart)
|
|
||||||
return generateTiledHoldNotes(HitObject.StartTime, segmentDuration, repeatCount);
|
|
||||||
|
|
||||||
return generateHoldAndNormalNotes(HitObject.StartTime, segmentDuration);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (segmentDuration <= 110)
|
|
||||||
{
|
|
||||||
if (PreviousPattern.ColumnsFilled < AvailableColumns)
|
|
||||||
convertType |= PatternType.ForceNotStack;
|
|
||||||
else
|
|
||||||
convertType &= ~PatternType.ForceNotStack;
|
|
||||||
return generateRandomNotes(HitObject.StartTime, segmentDuration, segmentDuration < 80 ? 0 : 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ConversionDifficulty > 6.5)
|
|
||||||
{
|
|
||||||
if ((convertType & PatternType.LowProbability) > 0)
|
|
||||||
return generateNRandomNotes(HitObject.StartTime, endTime, 0.78, 0.3, 0);
|
|
||||||
return generateNRandomNotes(HitObject.StartTime, endTime, 0.85, 0.36, 0.03);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ConversionDifficulty > 4)
|
|
||||||
{
|
|
||||||
if ((convertType & PatternType.LowProbability) > 0)
|
|
||||||
return generateNRandomNotes(HitObject.StartTime, endTime, 0.43, 0.08, 0);
|
|
||||||
return generateNRandomNotes(HitObject.StartTime, endTime, 0.56, 0.18, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ConversionDifficulty > 2.5)
|
|
||||||
{
|
|
||||||
if ((convertType & PatternType.LowProbability) > 0)
|
|
||||||
return generateNRandomNotes(HitObject.StartTime, endTime, 0.3, 0, 0);
|
|
||||||
return generateNRandomNotes(HitObject.StartTime, endTime, 0.37, 0.08, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((convertType & PatternType.LowProbability) > 0)
|
|
||||||
return generateNRandomNotes(HitObject.StartTime, endTime, 0.17, 0, 0);
|
|
||||||
return generateNRandomNotes(HitObject.StartTime, endTime, 0.27, 0, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Generates random hold notes that start at an span the same amount of rows.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="startTime">Start time of each hold note.</param>
|
|
||||||
/// <param name="endTime">End time of the hold notes.</param>
|
|
||||||
/// <param name="noteCount">Number of hold notes.</param>
|
|
||||||
/// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
|
|
||||||
private Pattern generateRandomHoldNotes(double startTime, double endTime, int noteCount)
|
|
||||||
{
|
|
||||||
// - - - -
|
|
||||||
// ■ - ■ ■
|
|
||||||
// □ - □ □
|
|
||||||
// ■ - ■ ■
|
|
||||||
|
|
||||||
var pattern = new Pattern();
|
|
||||||
|
|
||||||
int usableColumns = AvailableColumns - RandomStart - PreviousPattern.ColumnsFilled;
|
|
||||||
int nextColumn = Random.Next(RandomStart, AvailableColumns);
|
|
||||||
for (int i = 0; i < Math.Min(usableColumns, noteCount); i++)
|
|
||||||
{
|
|
||||||
while (pattern.IsFilled(nextColumn) || PreviousPattern.IsFilled(nextColumn)) //find available column
|
|
||||||
nextColumn = Random.Next(RandomStart, AvailableColumns);
|
|
||||||
AddToPattern(pattern, HitObject, nextColumn, startTime, endTime, noteCount);
|
|
||||||
}
|
|
||||||
|
|
||||||
// This is can't be combined with the above loop due to RNG
|
|
||||||
for (int i = 0; i < noteCount - usableColumns; i++)
|
|
||||||
{
|
|
||||||
while (pattern.IsFilled(nextColumn))
|
|
||||||
nextColumn = Random.Next(RandomStart, AvailableColumns);
|
|
||||||
AddToPattern(pattern, HitObject, nextColumn, startTime, endTime, noteCount);
|
|
||||||
}
|
|
||||||
|
|
||||||
return pattern;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Generates random notes, with one note per row and no stacking.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="startTime">The start time.</param>
|
|
||||||
/// <param name="separationTime">The separation of notes between rows.</param>
|
|
||||||
/// <param name="repeatCount">The number of rows.</param>
|
|
||||||
/// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
|
|
||||||
private Pattern generateRandomNotes(double startTime, double separationTime, int repeatCount)
|
|
||||||
{
|
|
||||||
// - - - -
|
|
||||||
// x - - -
|
|
||||||
// - - x -
|
|
||||||
// - - - x
|
|
||||||
// x - - -
|
|
||||||
|
|
||||||
var pattern = new Pattern();
|
|
||||||
|
|
||||||
int nextColumn = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
|
|
||||||
if ((convertType & PatternType.ForceNotStack) > 0 && PreviousPattern.ColumnsFilled < AvailableColumns)
|
|
||||||
{
|
|
||||||
while (PreviousPattern.IsFilled(nextColumn))
|
|
||||||
nextColumn = Random.Next(RandomStart, AvailableColumns);
|
|
||||||
}
|
|
||||||
|
|
||||||
int lastColumn = nextColumn;
|
|
||||||
for (int i = 0; i <= repeatCount; i++)
|
|
||||||
{
|
|
||||||
AddToPattern(pattern, HitObject, nextColumn, startTime, startTime);
|
|
||||||
while (nextColumn == lastColumn)
|
|
||||||
nextColumn = Random.Next(RandomStart, AvailableColumns);
|
|
||||||
|
|
||||||
lastColumn = nextColumn;
|
|
||||||
startTime += separationTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
return pattern;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Generates a stair of notes, with one note per row.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="startTime">The start time.</param>
|
|
||||||
/// <param name="separationTime">The separation of notes between rows.</param>
|
|
||||||
/// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
|
|
||||||
private Pattern generateStair(double startTime, double separationTime)
|
|
||||||
{
|
|
||||||
// - - - -
|
|
||||||
// x - - -
|
|
||||||
// - x - -
|
|
||||||
// - - x -
|
|
||||||
// - - - x
|
|
||||||
// - - x -
|
|
||||||
// - x - -
|
|
||||||
// x - - -
|
|
||||||
|
|
||||||
var pattern = new Pattern();
|
|
||||||
|
|
||||||
int column = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
|
|
||||||
bool increasing = Random.NextDouble() > 0.5;
|
|
||||||
|
|
||||||
for (int i = 0; i <= repeatCount; i++)
|
|
||||||
{
|
|
||||||
AddToPattern(pattern, HitObject, column, startTime, startTime);
|
|
||||||
startTime += separationTime;
|
|
||||||
|
|
||||||
// Check if we're at the borders of the stage, and invert the pattern if so
|
|
||||||
if (increasing)
|
|
||||||
{
|
|
||||||
if (column >= AvailableColumns - 1)
|
|
||||||
{
|
|
||||||
increasing = false;
|
|
||||||
column--;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
column++;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (column <= RandomStart)
|
|
||||||
{
|
|
||||||
increasing = true;
|
|
||||||
column++;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
column--;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return pattern;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Generates random notes with 1-2 notes per row and no stacking.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="startTime">The start time.</param>
|
|
||||||
/// <param name="separationTime">The separation of notes between rows.</param>
|
|
||||||
/// <param name="repeatCount">The number of rows.</param>
|
|
||||||
/// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
|
|
||||||
private Pattern generateRandomMultipleNotes(double startTime, double separationTime, int repeatCount)
|
|
||||||
{
|
|
||||||
// - - - -
|
|
||||||
// x - -
|
|
||||||
// - x x -
|
|
||||||
// - - - x
|
|
||||||
// x - x -
|
|
||||||
|
|
||||||
var pattern = new Pattern();
|
|
||||||
|
|
||||||
bool legacy = AvailableColumns >= 4 && AvailableColumns <= 8;
|
|
||||||
int interval = Random.Next(1, AvailableColumns - (legacy ? 1 : 0));
|
|
||||||
|
|
||||||
int nextColumn = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
|
|
||||||
for (int i = 0; i <= repeatCount; i++)
|
|
||||||
{
|
|
||||||
AddToPattern(pattern, HitObject, nextColumn, startTime, startTime, 2);
|
|
||||||
|
|
||||||
nextColumn += interval;
|
|
||||||
if (nextColumn >= AvailableColumns - RandomStart)
|
|
||||||
nextColumn = nextColumn - AvailableColumns - RandomStart + (legacy ? 1 : 0);
|
|
||||||
nextColumn += RandomStart;
|
|
||||||
|
|
||||||
// If we're in 2K, let's not add many consecutive doubles
|
|
||||||
if (AvailableColumns > 2)
|
|
||||||
AddToPattern(pattern, HitObject, nextColumn, startTime, startTime, 2);
|
|
||||||
|
|
||||||
nextColumn = Random.Next(RandomStart, AvailableColumns);
|
|
||||||
startTime += separationTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
return pattern;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Generates random hold notes. The amount of hold notes generated is determined by probabilities.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="startTime">The hold note start time.</param>
|
|
||||||
/// <param name="endTime">The hold note end time.</param>
|
|
||||||
/// <param name="p2">The probability required for 2 hold notes to be generated.</param>
|
|
||||||
/// <param name="p3">The probability required for 3 hold notes to be generated.</param>
|
|
||||||
/// <param name="p4">The probability required for 4 hold notes to be generated.</param>
|
|
||||||
/// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
|
|
||||||
private Pattern generateNRandomNotes(double startTime, double endTime, double p2, double p3, double p4)
|
|
||||||
{
|
|
||||||
// - - - -
|
|
||||||
// ■ - ■ ■
|
|
||||||
// □ - □ □
|
|
||||||
// ■ - ■ ■
|
|
||||||
|
|
||||||
switch (AvailableColumns)
|
|
||||||
{
|
|
||||||
case 2:
|
|
||||||
p2 = 0;
|
|
||||||
p3 = 0;
|
|
||||||
p4 = 0;
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
p2 = Math.Max(p2, 0.1);
|
|
||||||
p3 = 0;
|
|
||||||
p4 = 0;
|
|
||||||
break;
|
|
||||||
case 4:
|
|
||||||
p2 = Math.Max(p2, 0.3);
|
|
||||||
p3 = Math.Max(p3, 0.04);
|
|
||||||
p4 = 0;
|
|
||||||
break;
|
|
||||||
case 5:
|
|
||||||
p2 = Math.Max(p2, 0.34);
|
|
||||||
p3 = Math.Max(p3, 0.1);
|
|
||||||
p4 = Math.Max(p4, 0.03);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
Func<SampleInfo, bool> isDoubleSample = sample => sample.Name == SampleInfo.HIT_CLAP && sample.Name == SampleInfo.HIT_FINISH;
|
|
||||||
|
|
||||||
bool canGenerateTwoNotes = (convertType & PatternType.LowProbability) == 0;
|
|
||||||
canGenerateTwoNotes &= HitObject.Samples.Any(isDoubleSample) || sampleInfoListAt(HitObject.StartTime).Any(isDoubleSample);
|
|
||||||
|
|
||||||
if (canGenerateTwoNotes)
|
|
||||||
p2 = 1;
|
|
||||||
|
|
||||||
return generateRandomHoldNotes(startTime, endTime, GetRandomNoteCount(p2, p3, p4));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Generates tiled hold notes. You can think of this as a stair of hold notes.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="startTime">The first hold note start time.</param>
|
|
||||||
/// <param name="separationTime">The separation time between hold notes.</param>
|
|
||||||
/// <param name="noteCount">The amount of hold notes.</param>
|
|
||||||
/// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
|
|
||||||
private Pattern generateTiledHoldNotes(double startTime, double separationTime, int noteCount)
|
|
||||||
{
|
|
||||||
// - - - -
|
|
||||||
// ■ ■ ■ ■
|
|
||||||
// □ □ □ □
|
|
||||||
// □ □ □ □
|
|
||||||
// □ □ □ ■
|
|
||||||
// □ □ ■ -
|
|
||||||
// □ ■ - -
|
|
||||||
// ■ - - -
|
|
||||||
|
|
||||||
var pattern = new Pattern();
|
|
||||||
|
|
||||||
int columnRepeat = Math.Min(noteCount, AvailableColumns);
|
|
||||||
|
|
||||||
int nextColumn = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
|
|
||||||
if ((convertType & PatternType.ForceNotStack) > 0 && PreviousPattern.ColumnsFilled < AvailableColumns)
|
|
||||||
{
|
|
||||||
while (PreviousPattern.IsFilled(nextColumn))
|
|
||||||
nextColumn = Random.Next(RandomStart, AvailableColumns);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int i = 0; i < columnRepeat; i++)
|
|
||||||
{
|
|
||||||
while (pattern.IsFilled(nextColumn))
|
|
||||||
nextColumn = Random.Next(RandomStart, AvailableColumns);
|
|
||||||
|
|
||||||
AddToPattern(pattern, HitObject, nextColumn, startTime, endTime, noteCount);
|
|
||||||
startTime += separationTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
return pattern;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Generates a hold note alongside normal notes.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="startTime">The start time of notes.</param>
|
|
||||||
/// <param name="separationTime">The separation time between notes.</param>
|
|
||||||
/// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
|
|
||||||
private Pattern generateHoldAndNormalNotes(double startTime, double separationTime)
|
|
||||||
{
|
|
||||||
// - - - -
|
|
||||||
// ■ x x -
|
|
||||||
// ■ - x x
|
|
||||||
// ■ x - x
|
|
||||||
// ■ - x x
|
|
||||||
|
|
||||||
var pattern = new Pattern();
|
|
||||||
|
|
||||||
int holdColumn = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
|
|
||||||
if ((convertType & PatternType.ForceNotStack) > 0 && PreviousPattern.ColumnsFilled < AvailableColumns)
|
|
||||||
{
|
|
||||||
while (PreviousPattern.IsFilled(holdColumn))
|
|
||||||
holdColumn = Random.Next(RandomStart, AvailableColumns);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create the hold note
|
|
||||||
AddToPattern(pattern, HitObject, holdColumn, startTime, separationTime * repeatCount);
|
|
||||||
|
|
||||||
int noteCount = 1;
|
|
||||||
if (ConversionDifficulty > 6.5)
|
|
||||||
noteCount = GetRandomNoteCount(0.63, 0);
|
|
||||||
else if (ConversionDifficulty > 4)
|
|
||||||
noteCount = GetRandomNoteCount(AvailableColumns < 6 ? 0.12 : 0.45, 0);
|
|
||||||
else if (ConversionDifficulty > 2.5)
|
|
||||||
noteCount = GetRandomNoteCount(AvailableColumns < 6 ? 0 : 0.24, 0);
|
|
||||||
noteCount = Math.Min(AvailableColumns - 1, noteCount);
|
|
||||||
|
|
||||||
bool ignoreHead = !sampleInfoListAt(startTime).Any(s => s.Name == SampleInfo.HIT_WHISTLE || s.Name == SampleInfo.HIT_FINISH || s.Name == SampleInfo.HIT_CLAP);
|
|
||||||
int nextColumn = Random.Next(RandomStart, AvailableColumns);
|
|
||||||
|
|
||||||
var rowPattern = new Pattern();
|
|
||||||
for (int i = 0; i <= repeatCount; i++)
|
|
||||||
{
|
|
||||||
if (!(ignoreHead && startTime == HitObject.StartTime))
|
|
||||||
{
|
|
||||||
for (int j = 0; j < noteCount; j++)
|
|
||||||
{
|
|
||||||
while (rowPattern.IsFilled(nextColumn) || nextColumn == holdColumn)
|
|
||||||
nextColumn = Random.Next(RandomStart, AvailableColumns);
|
|
||||||
AddToPattern(rowPattern, HitObject, nextColumn, startTime, startTime, noteCount + 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pattern.Add(rowPattern);
|
|
||||||
rowPattern.Clear();
|
|
||||||
|
|
||||||
startTime += separationTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
return pattern;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Retrieves the sample info list at a point in time.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="time">The time to retrieve the sample info list from.</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
private SampleInfoList sampleInfoListAt(double time)
|
|
||||||
{
|
|
||||||
var curveData = HitObject as IHasCurve;
|
|
||||||
|
|
||||||
if (curveData == null)
|
|
||||||
return HitObject.Samples;
|
|
||||||
|
|
||||||
double segmentTime = (curveData.EndTime - HitObject.StartTime) / repeatCount;
|
|
||||||
|
|
||||||
int index = (int)(segmentTime == 0 ? 0 : (time - HitObject.StartTime) / segmentTime);
|
|
||||||
return curveData.RepeatSamples[index];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -47,7 +47,6 @@
|
|||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Beatmaps\Patterns\Legacy\DistanceObjectPatternGenerator.cs" />
|
|
||||||
<Compile Include="Beatmaps\Patterns\Legacy\PatternGenerator.cs" />
|
<Compile Include="Beatmaps\Patterns\Legacy\PatternGenerator.cs" />
|
||||||
<Compile Include="Beatmaps\Patterns\PatternGenerator.cs" />
|
<Compile Include="Beatmaps\Patterns\PatternGenerator.cs" />
|
||||||
<Compile Include="Beatmaps\LegacyBeatmapConverter.cs" />
|
<Compile Include="Beatmaps\LegacyBeatmapConverter.cs" />
|
||||||
|
|||||||
Reference in New Issue
Block a user