h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-29 08:52:57 +08:00
Code Issues Releases Wiki Activity

Merge pull request #1938 from Shawdooow/overall-difficulty

Browse Source 
Overall difficulty
This commit is contained in:
Dan Balasescu 2018-01-22 14:25:19 +09:00 committed by GitHub
commit 2e2fc4be57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -60,7 +60,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
Samples = s.Samples, Samples = s.Samples,
SampleControlPoint = s.SampleControlPoint, SampleControlPoint = s.SampleControlPoint,
TimePreempt = s.TimePreempt, TimePreempt = s.TimePreempt,
TimeFadein = s.TimeFadein TimeFadein = s.TimeFadein,
HitWindow300 = s.HitWindow300,
HitWindow100 = s.HitWindow100,
HitWindow50 = s.HitWindow50
}) })
}; };

18
osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
View File

@ -16,9 +16,9 @@ namespace osu.Game.Rulesets.Osu.Objects
public const double OBJECT_RADIUS = 64; public const double OBJECT_RADIUS = 64;
private const double hittable_range = 300; private const double hittable_range = 300;
private const double hit_window_50 = 150; public double HitWindow50 = 150;
private const double hit_window_100 = 80; public double HitWindow100 = 80;
private const double hit_window_300 = 30; public double HitWindow300 = 30;
public float TimePreempt = 600; public float TimePreempt = 600;
public float TimeFadein = 400; public float TimeFadein = 400;
@ -50,13 +50,13 @@ namespace osu.Game.Rulesets.Osu.Objects
switch (result) switch (result)
{ {
default: default:
return 300; return hittable_range;
case HitResult.Meh: case HitResult.Meh:
return 150; return HitWindow50;
case HitResult.Good: case HitResult.Good:
return 80; return HitWindow100;
case HitResult.Great: case HitResult.Great:
return 30; return HitWindow300;
} }
} }
@ -78,6 +78,10 @@ namespace osu.Game.Rulesets.Osu.Objects
TimePreempt = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450); TimePreempt = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450);
TimeFadein = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1200, 800, 300); TimeFadein = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1200, 800, 300);
HitWindow50 = BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 200, 150, 100);
HitWindow100 = BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 140, 100, 60);
HitWindow300 = BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 80, 50, 20);
Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2; Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2;
} }
} }