diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj index 8ffa6b62f7..bbca4145c6 100644 --- a/osu.Desktop/osu.Desktop.csproj +++ b/osu.Desktop/osu.Desktop.csproj @@ -103,6 +103,7 @@ 6 prompt AllRules.ruleset + --tests diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs index b1ba99d98b..99f55cb98b 100644 --- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs +++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs @@ -33,12 +33,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy float positionSeparation = ((positionData?.Position ?? Vector2.Zero) - previousPosition).Length; double timeSeparation = hitObject.StartTime - previousTime; - if (timeSeparation <= 125) - { - // More than 120 BPM - convertType |= PatternType.ForceNotStack; - } - if (timeSeparation <= 80) { // More than 187 BPM @@ -64,7 +58,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy // More than 111 BPM stream convertType |= PatternType.Cycle | PatternType.KeepSingle; } - else if (timeSeparation <= 150 & positionSeparation < 20) + else if (timeSeparation <= 150 && positionSeparation < 20) { // More than 100 BPM stream convertType |= PatternType.ForceStack | PatternType.LowProbability; @@ -401,4 +395,4 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy }); } } -} \ No newline at end of file +}