sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix remaining usage of hit window constants.

Browse Source
This commit is contained in:
Dean Herbert
2017-03-06 23:26:57 +09:00
parent 610de4a34c
commit fc6bd386ea
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
{
if (!userTriggered)
{
if (Judgement.TimeOffset > OsuHitObject.HIT_WINDOW_50)
if (Judgement.TimeOffset > HitObject.HitWindowFor(OsuScoreResult.Hit50))
Judgement.Result = HitResult.Miss;
return;
}
@ -82,7 +82,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
OsuJudgementInfo osuJudgement = Judgement as OsuJudgementInfo;
if (hitOffset < OsuHitObject.HIT_WINDOW_50)
if (hitOffset < HitObject.HitWindowFor(OsuScoreResult.Hit50))
{
Judgement.Result = HitResult.Hit;
osuJudgement.Score = HitObject.ScoreResultForOffset(hitOffset);

11
osu.Game.Modes.Osu/Objects/OsuHitObject.cs
View File

@ -11,12 +11,13 @@ namespace osu.Game.Modes.Osu.Objects
{
public abstract class OsuHitObject : HitObject
{
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 OBJECT_RADIUS = 64;
private const double hittable_range = 300;
private const double hit_window_50 = 150;
private const double hit_window_100 = 80;
private const double hit_window_300 = 30;
public Vector2 Position { get; set; }
public Vector2 StackedPosition => Position + StackOffset;
@ -29,6 +30,8 @@ namespace osu.Game.Modes.Osu.Objects
public Vector2 StackOffset => new Vector2(StackHeight * Scale * -6.4f);
public double Radius => OBJECT_RADIUS * Scale;
public float Scale { get; set; } = 1;
public abstract HitObjectType Type { get; }