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
commit 651a608e73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 4 deletions

View File

@ -62,7 +62,16 @@ protected override SpriteText CreateJudgementText() =>
/// </remarks> /// </remarks>
public virtual void PlayAnimation() 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.6f);
this.ScaleTo(1, 100, Easing.In); this.ScaleTo(1, 100, Easing.In);

View File

@ -38,7 +38,20 @@ protected override SpriteText CreateJudgementText() =>
/// </remarks> /// </remarks>
public virtual void PlayAnimation() 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.6f);
this.ScaleTo(1, 100, Easing.In); this.ScaleTo(1, 100, Easing.In);

View File

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