sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fixing minor bugs

Browse Source
This commit is contained in:
frankhjwx
2018-05-21 13:53:48 +08:00
parent 193a298601
commit 4784538d73
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

Submodule osu-framework updated: 80e78fd45b...fac688633b

7
osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
View File

@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
difficultyHitObjects.Clear(); difficultyHitObjects.Clear();
float circleSize = Beatmap.BeatmapInfo.BaseDifficulty.CircleSize; float circleSize = Beatmap.BeatmapInfo.BaseDifficulty.CircleSize;
float catcherWidth = ((1.0f - 0.7f * (circleSize - 5) / 5) * 0.62064f) * CatcherArea.CATCHER_SIZE; float catcherWidth = (1.0f - 0.7f * (circleSize - 5) / 5) * 0.62064f * CatcherArea.CATCHER_SIZE;
float catcherWidthHalf = catcherWidth / 2; float catcherWidthHalf = catcherWidth / 2;
catcherWidthHalf *= 0.8f; catcherWidthHalf *= 0.8f;
@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
double ar = Beatmap.BeatmapInfo.BaseDifficulty.ApproachRate; double ar = Beatmap.BeatmapInfo.BaseDifficulty.ApproachRate;
double preEmpt = BeatmapDifficulty.DifficultyRange(ar, 1800, 1200, 450) / TimeRate; double preEmpt = BeatmapDifficulty.DifficultyRange(ar, 1800, 1200, 450) / TimeRate;
categoryDifficulty["AR"] = (preEmpt > 1200.0) ? -(preEmpt - 1800.0) / 120.0 : (-(preEmpt - 1200.0) / 150.0) + 5.0; categoryDifficulty["AR"] = preEmpt > 1200.0 ? -(preEmpt - 1800.0) / 120.0 : -(preEmpt - 1200.0) / 150.0 + 5.0;
categoryDifficulty["Max combo"] = difficultyHitObjects.Count; categoryDifficulty["Max combo"] = difficultyHitObjects.Count;
} }
@ -92,8 +92,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
while (hitObjectsEnumerator.MoveNext()) while (hitObjectsEnumerator.MoveNext())
{ {
CatchDifficultyHitObject nextHitObject = hitObjectsEnumerator.Current; CatchDifficultyHitObject nextHitObject = hitObjectsEnumerator.Current;
if (nextHitObject != null) nextHitObject?.CalculateStrains(currentHitObject, TimeRate);
nextHitObject.CalculateStrains(currentHitObject, TimeRate);
currentHitObject = nextHitObject; currentHitObject = nextHitObject;
} }