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

Move constants to base OsuHitObject representation.

Browse Source
This commit is contained in:
Dean Herbert
2017-03-06 12:58:14 +09:00
parent 910d9ccc00
commit 20fcb8848b
4 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
View File

@ -69,18 +69,11 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
Size = circle.DrawSize;
}
//todo: these aren't constants.
public const double HITTABLE_RANGE = 300;
public const double HIT_WINDOW_50 = 150;
public const double HIT_WINDOW_100 = 80;
public const double HIT_WINDOW_300 = 30;
public const double CIRCLE_RADIUS = 64;
protected override void CheckJudgement(bool userTriggered)
{
if (!userTriggered)
{
if (Judgement.TimeOffset > HIT_WINDOW_50)
if (Judgement.TimeOffset > OsuHitObject.HIT_WINDOW_50)
Judgement.Result = HitResult.Miss;
return;
}
@ -89,15 +82,15 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
OsuJudgementInfo osuJudgement = Judgement as OsuJudgementInfo;
if (hitOffset < HIT_WINDOW_50)
if (hitOffset < OsuHitObject.HIT_WINDOW_50)
{
Judgement.Result = HitResult.Hit;
if (hitOffset < HIT_WINDOW_300)
if (hitOffset < OsuHitObject.HIT_WINDOW_300)
osuJudgement.Score = OsuScoreResult.Hit300;
else if (hitOffset < HIT_WINDOW_100)
else if (hitOffset < OsuHitObject.HIT_WINDOW_100)
osuJudgement.Score = OsuScoreResult.Hit100;
else if (hitOffset < HIT_WINDOW_50)
else if (hitOffset < OsuHitObject.HIT_WINDOW_50)
osuJudgement.Score = OsuScoreResult.Hit50;
}
else