h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-06 08:22:56 +08:00
Code Issues Releases Wiki Activity

Update argon and triangles to match display style

Browse Source
This commit is contained in:
Dean Herbert 2023-12-25 17:32:30 +09:00
parent 02c771f540
commit 8e6ea2dd9b
No known key found for this signature in database
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 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
/// </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);

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

@ -38,7 +38,20 @@ namespace osu.Game.Rulesets.Judgements
/// </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);

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

@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Scoring
/// 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 @@ namespace osu.Game.Rulesets.Scoring
/// 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,