h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 21:43:04 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into catch-catcher

Browse Source
This commit is contained in:
Dean Herbert 2017-08-09 09:03:07 +09:00 committed by GitHub
commit d9f5035d44
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Desktop/osu.Desktop.csproj
View File

@ -103,6 +103,7 @@
<LangVersion>6</LangVersion> <LangVersion>6</LangVersion>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<StartArguments>--tests</StartArguments>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="DeltaCompressionDotNet, Version=1.1.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL"> <Reference Include="DeltaCompressionDotNet, Version=1.1.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">

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

@ -33,12 +33,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
float positionSeparation = ((positionData?.Position ?? Vector2.Zero) - previousPosition).Length; float positionSeparation = ((positionData?.Position ?? Vector2.Zero) - previousPosition).Length;
double timeSeparation = hitObject.StartTime - previousTime; double timeSeparation = hitObject.StartTime - previousTime;
if (timeSeparation <= 125)
{
// More than 120 BPM
convertType |= PatternType.ForceNotStack;
}
if (timeSeparation <= 80) if (timeSeparation <= 80)
{ {
// More than 187 BPM // More than 187 BPM
@ -64,7 +58,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
// More than 111 BPM stream // More than 111 BPM stream
convertType |= PatternType.Cycle | PatternType.KeepSingle; convertType |= PatternType.Cycle | PatternType.KeepSingle;
} }
else if (timeSeparation <= 150 & positionSeparation < 20) else if (timeSeparation <= 150 && positionSeparation < 20)
{ {
// More than 100 BPM stream // More than 100 BPM stream
convertType |= PatternType.ForceStack | PatternType.LowProbability; convertType |= PatternType.ForceStack | PatternType.LowProbability;
@ -401,4 +395,4 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
}); });
} }
} }
} }