Skip to content

Add classic skin sprites for slider tick and slider end misses #26117

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 4 commits into from
Dec 25, 2023
Merged

Add classic skin sprites for slider tick and slider end misses #26117

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1d994b
Add classic skin sprites for slider tick and slider end misses
peppy Dec 25, 2023
8142a7c
Remove incorrect spec
bdach Dec 25, 2023
3748541
Merge branch 'master' into add-slider-tick-end-miss-sprites
bdach Dec 25, 2023
4fa35d7
Update resources
bdach Dec 25, 2023
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
16 changes: 13 additions & 3 deletions osu.Game/Skinning/LegacyJudgementPieceOld.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,24 @@ public virtual void PlayAnimation()

if (result.IsMiss())
{
decimal? legacyVersion = skin.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value;

// missed ticks / slider end don't get the normal animation.
if (isMissedTick())
applyMissedTickScaling();
else
{
this.ScaleTo(1.6f);
this.ScaleTo(1, 100, Easing.In);

decimal? legacyVersion = skin.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value;
if (legacyVersion > 1.0m)
{
this.MoveTo(new Vector2(0, -2f));
this.MoveToOffset(new Vector2(0, 10), fade_out_delay + fade_out_length, Easing.In);
}
}
else
{
this.ScaleTo(1.6f);
this.ScaleTo(1, 100, Easing.In);

if (legacyVersion > 1.0m)
{
Expand Down
13 changes: 10 additions & 3 deletions osu.Game/Skinning/LegacySkin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,11 +453,18 @@ protected override void ParseConfigurationStream(Stream stream)

private Drawable? getJudgementAnimation(HitResult result)
{
if (result.IsMiss())
return this.GetAnimation("hit0", true, false);

switch (result)
{
case HitResult.Miss:
return this.GetAnimation("hit0", true, false);

case HitResult.LargeTickMiss:
return this.GetAnimation("slidertickmiss", true, false);

case HitResult.ComboBreak:
case HitResult.IgnoreMiss:
return this.GetAnimation("sliderendmiss", true, false);

case HitResult.Meh:
return this.GetAnimation("hit50", true, false);

Expand Down