Skip to content

Fix slider tick / end misses displaying with full size on legacy skins with animated misses #26003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 21, 2023
Merged

Fix slider tick / end misses displaying with full size on legacy skins with animated misses #26003

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions osu.Game/Skinning/LegacyJudgementPieceOld.cs
View file
Open in desktop
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();
}
}