mirror of https://github.com/ppy/osu
Replace comparison references to HitResult.Miss with IsHit
This commit is contained in:
parent
36dbb1b70a
commit
2b1ef16f89
|
@ -36,7 +36,7 @@ public void OnNewResult(DrawableCatchHitObject judgedObject, JudgementResult res
|
||||||
if (!result.Type.AffectsCombo() || !result.HasResult)
|
if (!result.Type.AffectsCombo() || !result.HasResult)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (result.Type == HitResult.Miss)
|
if (!result.IsHit)
|
||||||
{
|
{
|
||||||
updateCombo(0, null);
|
updateCombo(0, null);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -243,7 +243,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
|
||||||
endHold();
|
endHold();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Tail.Result.Type == HitResult.Miss)
|
if (Tail.Judged && !Tail.IsHit)
|
||||||
HasBroken = true;
|
HasBroken = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ public void TestMissViaEarlyHit()
|
||||||
{
|
{
|
||||||
HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
|
HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
|
||||||
},
|
},
|
||||||
PassCondition = () => Player.Results.Count > 0 && Player.Results[0].TimeOffset < -hitWindows.WindowFor(HitResult.Meh) && Player.Results[0].Type == HitResult.Miss
|
PassCondition = () => Player.Results.Count > 0 && Player.Results[0].TimeOffset < -hitWindows.WindowFor(HitResult.Meh) && !Player.Results[0].IsHit
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -59,7 +59,7 @@ public void TestMissViaNotHitting()
|
||||||
{
|
{
|
||||||
Autoplay = false,
|
Autoplay = false,
|
||||||
Beatmap = beatmap,
|
Beatmap = beatmap,
|
||||||
PassCondition = () => Player.Results.Count > 0 && Player.Results[0].TimeOffset >= hitWindows.WindowFor(HitResult.Meh) && Player.Results[0].Type == HitResult.Miss
|
PassCondition = () => Player.Results.Count > 0 && Player.Results[0].TimeOffset >= hitWindows.WindowFor(HitResult.Meh) && !Player.Results[0].IsHit
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -314,7 +314,7 @@ public void TestTrackingAreaOutsideEdge()
|
||||||
|
|
||||||
private bool assertMaxJudge() => judgementResults.Any() && judgementResults.All(t => t.Type == t.Judgement.MaxResult);
|
private bool assertMaxJudge() => judgementResults.Any() && judgementResults.All(t => t.Type == t.Judgement.MaxResult);
|
||||||
|
|
||||||
private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.IgnoreHit && judgementResults.First().Type == HitResult.Miss;
|
private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.IgnoreHit && !judgementResults.First().IsHit;
|
||||||
|
|
||||||
private bool assertMidSliderJudgements() => judgementResults[^2].Type == HitResult.IgnoreHit;
|
private bool assertMidSliderJudgements() => judgementResults[^2].Type == HitResult.IgnoreHit;
|
||||||
|
|
||||||
|
|
|
@ -143,7 +143,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
|
||||||
var circleResult = (OsuHitCircleJudgementResult)r;
|
var circleResult = (OsuHitCircleJudgementResult)r;
|
||||||
|
|
||||||
// Todo: This should also consider misses, but they're a little more interesting to handle, since we don't necessarily know the position at the time of a miss.
|
// Todo: This should also consider misses, but they're a little more interesting to handle, since we don't necessarily know the position at the time of a miss.
|
||||||
if (result != HitResult.Miss)
|
if (result.IsHit())
|
||||||
{
|
{
|
||||||
var localMousePosition = ToLocalSpace(inputManager.CurrentState.Mouse.Position);
|
var localMousePosition = ToLocalSpace(inputManager.CurrentState.Mouse.Position);
|
||||||
circleResult.CursorPositionAtHit = HitObject.StackedPosition + (localMousePosition - DrawSize / 2);
|
circleResult.CursorPositionAtHit = HitObject.StackedPosition + (localMousePosition - DrawSize / 2);
|
||||||
|
|
|
@ -67,7 +67,7 @@ protected override void PrepareForUse()
|
||||||
if (JudgedObject != null)
|
if (JudgedObject != null)
|
||||||
{
|
{
|
||||||
lightingColour = JudgedObject.AccentColour.GetBoundCopy();
|
lightingColour = JudgedObject.AccentColour.GetBoundCopy();
|
||||||
lightingColour.BindValueChanged(colour => Lighting.Colour = Result.Type == HitResult.Miss ? Color4.Transparent : colour.NewValue, true);
|
lightingColour.BindValueChanged(colour => Lighting.Colour = Result.IsHit ? colour.NewValue : Color4.Transparent, true);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -250,7 +250,7 @@ public override void PlaySamples()
|
||||||
{
|
{
|
||||||
// rather than doing it this way, we should probably attach the sample to the tail circle.
|
// rather than doing it this way, we should probably attach the sample to the tail circle.
|
||||||
// this can only be done after we stop using LegacyLastTick.
|
// this can only be done after we stop using LegacyLastTick.
|
||||||
if (TailCircle.Result.Type != HitResult.Miss)
|
if (TailCircle.IsHit)
|
||||||
base.PlaySamples();
|
base.PlaySamples();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -107,7 +107,7 @@ private void onNewResult(DrawableHitObject obj, JudgementResult result)
|
||||||
if (!(obj is DrawableDrumRollTick))
|
if (!(obj is DrawableDrumRollTick))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (result.Type > HitResult.Miss)
|
if (result.IsHit)
|
||||||
rollingHits++;
|
rollingHits++;
|
||||||
else
|
else
|
||||||
rollingHits--;
|
rollingHits--;
|
||||||
|
|
|
@ -27,7 +27,7 @@ public class TaikoHealthProcessor : AccumulatingHealthProcessor
|
||||||
private double hpMultiplier;
|
private double hpMultiplier;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// HP multiplier for a <see cref="HitResult.Miss"/>.
|
/// HP multiplier for a <see cref="HitResult"/> that does not satisfy <see cref="HitResultExtensions.IsHit"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private double hpMissMultiplier;
|
private double hpMissMultiplier;
|
||||||
|
|
||||||
|
@ -45,6 +45,6 @@ public override void ApplyBeatmap(IBeatmap beatmap)
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override double GetHealthIncreaseFor(JudgementResult result)
|
protected override double GetHealthIncreaseFor(JudgementResult result)
|
||||||
=> base.GetHealthIncreaseFor(result) * (result.Type == HitResult.Miss ? hpMissMultiplier : hpMultiplier);
|
=> base.GetHealthIncreaseFor(result) * (result.IsHit ? hpMultiplier : hpMissMultiplier);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,7 +45,7 @@ protected override void LoadComplete()
|
||||||
if (r?.Type.AffectsCombo() == false)
|
if (r?.Type.AffectsCombo() == false)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
passing = r == null || r.Type > HitResult.Miss;
|
passing = r == null || r.IsHit;
|
||||||
|
|
||||||
foreach (var sprite in InternalChildren.OfType<ScrollerSprite>())
|
foreach (var sprite in InternalChildren.OfType<ScrollerSprite>())
|
||||||
sprite.Passing = passing;
|
sprite.Passing = passing;
|
||||||
|
|
|
@ -37,7 +37,7 @@ private void load(OsuColour colours)
|
||||||
Alpha = 0.15f;
|
Alpha = 0.15f;
|
||||||
Masking = true;
|
Masking = true;
|
||||||
|
|
||||||
if (result == HitResult.Miss)
|
if (!result.IsHit())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
bool isRim = (judgedObject.HitObject as Hit)?.Type == HitType.Rim;
|
bool isRim = (judgedObject.HitObject as Hit)?.Type == HitType.Rim;
|
||||||
|
|
|
@ -511,7 +511,7 @@ protected void ApplyResult(Action<JudgementResult> application)
|
||||||
case HitResult.None:
|
case HitResult.None:
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case HitResult.Miss:
|
case { } result when !result.IsHit():
|
||||||
updateState(ArmedState.Miss);
|
updateState(ArmedState.Miss);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -106,7 +106,7 @@ private void load(OsuColour colours)
|
||||||
|
|
||||||
public void Flash(JudgementResult result)
|
public void Flash(JudgementResult result)
|
||||||
{
|
{
|
||||||
if (result.Type == HitResult.Miss)
|
if (!result.IsHit)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Scheduler.AddOnce(flash);
|
Scheduler.AddOnce(flash);
|
||||||
|
|
|
@ -48,7 +48,7 @@ public class HitEventTimingDistributionGraph : CompositeDrawable
|
||||||
/// <param name="hitEvents">The <see cref="HitEvent"/>s to display the timing distribution of.</param>
|
/// <param name="hitEvents">The <see cref="HitEvent"/>s to display the timing distribution of.</param>
|
||||||
public HitEventTimingDistributionGraph(IReadOnlyList<HitEvent> hitEvents)
|
public HitEventTimingDistributionGraph(IReadOnlyList<HitEvent> hitEvents)
|
||||||
{
|
{
|
||||||
this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result != HitResult.Miss).ToList();
|
this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result.IsHit()).ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
|
|
|
@ -20,7 +20,7 @@ public class UnstableRate : SimpleStatisticItem<double>
|
||||||
public UnstableRate(IEnumerable<HitEvent> hitEvents)
|
public UnstableRate(IEnumerable<HitEvent> hitEvents)
|
||||||
: base("Unstable Rate")
|
: base("Unstable Rate")
|
||||||
{
|
{
|
||||||
var timeOffsets = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result != HitResult.Miss)
|
var timeOffsets = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result.IsHit())
|
||||||
.Select(ev => ev.TimeOffset).ToArray();
|
.Select(ev => ev.TimeOffset).ToArray();
|
||||||
Value = 10 * standardDeviation(timeOffsets);
|
Value = 10 * standardDeviation(timeOffsets);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue