Skip to content

Commit

Permalink
Merge pull request #26003 from bdach/big-slider-judgements
Browse files Browse the repository at this point in the history
Fix slider tick / end misses displaying with full size on legacy skins with animated misses
  • Loading branch information
peppy authored Dec 21, 2023
2 parents 7e9d12e + b4e71a0 commit 472a9da
Showing 1 changed file with 14 additions and 7 deletions.
21 changes: 14 additions & 7 deletions osu.Game/Skinning/LegacyJudgementPieceOld.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,16 @@ public virtual void PlayAnimation()

// legacy judgements don't play any transforms if they are an animation.... UNLESS they are the temporary displayed judgement from new piece.
if (animation?.FrameCount > 1 && !forceTransforms)
{
if (isMissedTick())
applyMissedTickScaling();
return;
}

if (result.IsMiss())
{
bool isTick = result != HitResult.Miss;

if (isTick)
{
this.ScaleTo(0.6f);
this.ScaleTo(0.3f, 100, Easing.In);
}
if (isMissedTick())
applyMissedTickScaling();
else
{
this.ScaleTo(1.6f);
Expand Down Expand Up @@ -95,6 +94,14 @@ public virtual void PlayAnimation()
}
}

private bool isMissedTick() => result.IsMiss() && result != HitResult.Miss;

private void applyMissedTickScaling()
{
this.ScaleTo(0.6f);
this.ScaleTo(0.3f, 100, Easing.In);
}

public Drawable GetAboveHitObjectsProxiedContent() => CreateProxy();
}
}

0 comments on commit 472a9da

Please sign in to comment.