RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26120 from peppy/argon-triangle-tick-end-miss 

Update argon and triangles slider tick/end miss to match display style
This commit is contained in:
Bartłomiej Dach 2023-12-25 14:42:59 +01:00 committed by GitHub
parent 4fc1691a57 8e6ea2dd9b
commit 651a608e73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
View File

@ -62,7 +62,16 @@ protected override SpriteText CreateJudgementText() =>
/// </remarks>
public virtual void PlayAnimation()
{
if (Result.IsMiss())
if (Result == HitResult.IgnoreMiss || Result == HitResult.LargeTickMiss)
{
this.RotateTo(-45);
this.ScaleTo(1.8f);
this.ScaleTo(1.2f, 100, Easing.In);
this.MoveTo(Vector2.Zero);
this.MoveToOffset(new Vector2(0, 10), 800, Easing.InQuint);
}
else if (Result.IsMiss())
{
this.ScaleTo(1.6f);
this.ScaleTo(1, 100, Easing.In);

15
osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
View File

@ -38,7 +38,20 @@ protected override SpriteText CreateJudgementText() =>
/// </remarks>
public virtual void PlayAnimation()
{
if (Result != HitResult.None && !Result.IsHit())
// TODO: make these better. currently they are using a text `-` and it's not centered properly.
// Should be an explicit drawable.
//
// When this is done, remove the [Description] attributes from HitResults which were added for this purpose.
if (Result == HitResult.IgnoreMiss || Result == HitResult.LargeTickMiss)
{
this.RotateTo(-45);
this.ScaleTo(1.8f);
this.ScaleTo(1.2f, 100, Easing.In);
this.MoveTo(Vector2.Zero);
this.MoveToOffset(new Vector2(0, 10), 800, Easing.InQuint);
}
else if (Result.IsMiss())
{
this.ScaleTo(1.6f);
this.ScaleTo(1, 100, Easing.In);

4
osu.Game/Rulesets/Scoring/HitResult.cs
View File

@ -86,7 +86,7 @@ public enum HitResult
/// Indicates a large tick miss.
/// </summary>
[EnumMember(Value = "large_tick_miss")]
[Description(@"x")]
[Description("-")]
[Order(10)]
LargeTickMiss,
@ -118,7 +118,7 @@ public enum HitResult
/// Indicates a miss that should be ignored for scoring purposes.
/// </summary>
[EnumMember(Value = "ignore_miss")]
[Description("x")]
[Description("-")]
[Order(13)]
IgnoreMiss,