h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 09:32:55 +08:00
Code Issues Releases Wiki Activity

Add + use HalfHitWindow

Browse Source
This commit is contained in:
smoogipoo 2018-02-02 20:29:50 +09:00
parent 6976347d64
commit 9225e883c1
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
View File

@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
switch (State.Value) switch (State.Value)
{ {
case ArmedState.Idle: case ArmedState.Idle:
this.Delay(HitObject.HitWindows.Miss / 2).Expire(); this.Delay(HitObject.HitWindows.HalfWindowFor(HitResult.Miss)).Expire();
break; break;
case ArmedState.Miss: case ArmedState.Miss:
this.FadeOut(100) this.FadeOut(100)

45
osu.Game/Rulesets/Objects/HitWindows.cs
View File

@ -65,37 +65,64 @@ namespace osu.Game.Rulesets.Objects
} }
/// <summary> /// <summary>
/// Retrieves the hit result for a time offset. /// Retrieves the <see cref="HitResult"/> for a time offset.
/// </summary> /// </summary>
/// <param name="timeOffset">The time offset. This should always be a positive value indicating the absolute time offset.</param> /// <param name="timeOffset">The time offset.</param>
/// <returns>The hit result, or null if <paramref name="timeOffset"/> doesn't result in a judgement.</returns> /// <returns>The hit result, or null if <paramref name="timeOffset"/> doesn't result in a judgement.</returns>
public HitResult? ResultFor(double timeOffset) public HitResult? ResultFor(double timeOffset)
{ {
timeOffset = Math.Abs(timeOffset); timeOffset = Math.Abs(timeOffset);
if (timeOffset <= Perfect / 2) if (timeOffset <= HalfWindowFor(HitResult.Perfect))
return HitResult.Perfect; return HitResult.Perfect;
if (timeOffset <= Great / 2) if (timeOffset <= HalfWindowFor(HitResult.Great))
return HitResult.Great; return HitResult.Great;
if (timeOffset <= Good / 2) if (timeOffset <= HalfWindowFor(HitResult.Good))
return HitResult.Good; return HitResult.Good;
if (timeOffset <= Ok / 2) if (timeOffset <= HalfWindowFor(HitResult.Ok))
return HitResult.Ok; return HitResult.Ok;
if (timeOffset <= Meh / 2) if (timeOffset <= HalfWindowFor(HitResult.Meh))
return HitResult.Meh; return HitResult.Meh;
if (timeOffset <= Miss / 2) if (timeOffset <= HalfWindowFor(HitResult.Miss))
return HitResult.Miss; return HitResult.Miss;
return null; return null;
} }
/// <summary>
/// Retrieves half the hit window for a <see cref="HitResult"/>.
/// This is useful if the of the hit window for one half of the hittable range of a <see cref="HitObject"/> is required.
/// </summary>
/// <param name="result">The expected <see cref="HitResult"/>.</param>
/// <returns>One half of the hit window for <paramref name="result"/>.</returns>
public double HalfWindowFor(HitResult result)
{
switch (result)
{
case HitResult.Perfect:
return Perfect / 2;
case HitResult.Great:
return Great / 2;
case HitResult.Good:
return Good / 2;
case HitResult.Ok:
return Ok / 2;
case HitResult.Meh:
return Meh / 2;
case HitResult.Miss:
return Miss / 2;
default:
throw new ArgumentException(nameof(result));
}
}
/// <summary> /// <summary>
/// Given a time offset, whether the <see cref="HitObject"/> can ever be hit in the future. /// Given a time offset, whether the <see cref="HitObject"/> can ever be hit in the future.
/// This happens if <paramref name="timeOffset"/> > <see cref="Meh"/>. /// This happens if <paramref name="timeOffset"/> > <see cref="Meh"/>.
/// </summary> /// </summary>
/// <param name="timeOffset">The time offset.</param> /// <param name="timeOffset">The time offset.</param>
/// <returns>Whether the <see cref="HitObject"/> can be hit at any point in the future from this time offset.</returns> /// <returns>Whether the <see cref="HitObject"/> can be hit at any point in the future from this time offset.</returns>
public bool CanBeHit(double timeOffset) => timeOffset <= Meh / 2; public bool CanBeHit(double timeOffset) => timeOffset <= HalfWindowFor(HitResult.Meh);
/// <summary> /// <summary>
/// Multiplies all hit windows by a value. /// Multiplies all hit windows by a value.