From 23f3cb646799637e4bea2fb1beaf1342baec515d Mon Sep 17 00:00:00 2001 From: Shawdooow Date: Wed, 3 Jan 2018 10:01:28 -0500 Subject: [PATCH] address review --- osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs index 1c0f64322f..feffb1ccf2 100644 --- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs +++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs @@ -75,11 +75,8 @@ namespace osu.Game.Rulesets.Osu.Objects { base.ApplyDefaultsToSelf(controlPointInfo, difficulty); - if (difficulty.ApproachRate >= 5) - TimePreempt = 1200 - (difficulty.ApproachRate - 5) * 150; - else - TimePreempt = 1800 - difficulty.ApproachRate * 120; - TimeFadein = TimePreempt * 0.66f; + TimePreempt = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450); + TimeFadein = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1200, 800, 300); Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2;