mirror of
https://github.com/ppy/osu
synced 2025-02-17 19:07:07 +00:00
overall difficulty
This commit is contained in:
parent
f0dbf2e18c
commit
4d1142a0ce
@ -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, 99.5, 149.5, 199.5);
|
||||||
|
HitWindow100 = BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 59.5, 99.5, 139.5);
|
||||||
|
HitWindow300 = BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 19.5, 49.5, 79.5);
|
||||||
|
|
||||||
Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2;
|
Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user