Merge branch 'master' into intro-triangles-background-access

osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs

@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             {
                 // if a taiko skin is providing explosion sprites, hide the judgements completely
                 if (hasExplosion.Value)
-                    return Drawable.Empty();
+                    return Drawable.Empty().With(d => d.Expire());
             }
 
             if (!(component is TaikoSkinComponent taikoComponent))
@@ -118,7 +118,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                     // suppress the default kiai explosion if the skin brings its own sprites.
                     // the drawable needs to expire as soon as possible to avoid accumulating empty drawables on the playfield.
                     if (hasExplosion.Value)
-                        return Drawable.Empty().With(d => d.LifetimeEnd = double.MinValue);
+                        return Drawable.Empty().With(d => d.Expire());
 
                     return null;
 

osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs

@@ -51,7 +51,7 @@ namespace osu.Game.Tests.Visual.Online
                 Username = "flyte",
                 Id = 3103765,
                 IsOnline = true,
-                CurrentModeRank = 1111,
+                Statistics = new UserStatistics { GlobalRank = 1111 },
                 Country = new Country { FlagName = "JP" },
                 CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
             },
@@ -60,7 +60,7 @@ namespace osu.Game.Tests.Visual.Online
                 Username = "peppy",
                 Id = 2,
                 IsOnline = false,
-                CurrentModeRank = 2222,
+                Statistics = new UserStatistics { GlobalRank = 2222 },
                 Country = new Country { FlagName = "AU" },
                 CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                 IsSupporter = true,

osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs

@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Playlists
                 Room.RecentParticipants.Add(new User
                 {
                     Username = "peppy",
-                    CurrentModeRank = 1234,
+                    Statistics = new UserStatistics { GlobalRank = 1234 },
                     Id = 2
                 });
             }

osu.Game.Tournament/TournamentGameBase.cs

@@ -150,7 +150,9 @@ namespace osu.Game.Tournament
             {
                 foreach (var p in t.Players)
                 {
-                    if (string.IsNullOrEmpty(p.Username) || p.Statistics?.GlobalRank == null)
+                    if (string.IsNullOrEmpty(p.Username)
+                        || p.Statistics?.GlobalRank == null
+                        || p.Statistics?.CountryRank == null)
                     {
                         PopulateUser(p, immediate: true);
                         addedInfo = true;

osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs

@@ -244,7 +244,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
                     return unsorted.OrderByDescending(u => u.LastVisit).ToList();
 
                 case UserSortCriteria.Rank:
-                    return unsorted.OrderByDescending(u => u.CurrentModeRank.HasValue).ThenBy(u => u.CurrentModeRank ?? 0).ToList();
+                    return unsorted.OrderByDescending(u => u.Statistics.GlobalRank.HasValue).ThenBy(u => u.Statistics.GlobalRank ?? 0).ToList();
 
                 case UserSortCriteria.Username:
                     return unsorted.OrderBy(u => u.Username).ToList();

osu.Game/Rulesets/Judgements/DrawableJudgement.cs

@@ -150,19 +150,15 @@ namespace osu.Game.Rulesets.Judgements
                 }
 
                 if (JudgementBody.Drawable is IAnimatableJudgement animatable)
-                {
-                    var drawableAnimation = (Drawable)animatable;
-
                     animatable.PlayAnimation();
 
                 // a derived version of DrawableJudgement may be proposing a lifetime.
                 // if not adjusted (or the skinned portion requires greater bounds than calculated) use the skinned source's lifetime.
-                    double lastTransformTime = drawableAnimation.LatestTransformEndTime;
+                double lastTransformTime = JudgementBody.Drawable.LatestTransformEndTime;
                 if (LifetimeEnd == double.MaxValue || lastTransformTime > LifetimeEnd)
                     LifetimeEnd = lastTransformTime;
             }
         }
-        }
 
         private HitResult? currentDrawableType;
 

osu.Game/Screens/Play/HUD/LegacyComboCounter.cs

@@ -84,14 +84,15 @@ namespace osu.Game.Screens.Play.HUD
         {
             InternalChildren = new[]
             {
-                displayedCountSpriteText = createSpriteText().With(s =>
-                {
-                    s.Alpha = 0;
-                }),
                 popOutCount = createSpriteText().With(s =>
                 {
                     s.Alpha = 0;
                     s.Margin = new MarginPadding(0.05f);
+                    s.Blending = BlendingParameters.Additive;
+                }),
+                displayedCountSpriteText = createSpriteText().With(s =>
+                {
+                    s.Alpha = 0;
                 })
             };
 

osu.Game/Users/User.cs

@@ -72,9 +72,6 @@ namespace osu.Game.Users
         [JsonProperty(@"support_level")]
         public int SupportLevel;
 
-        [JsonProperty(@"current_mode_rank")]
-        public int? CurrentModeRank;
-
         [JsonProperty(@"is_gmt")]
         public bool IsGMT;
 
@@ -182,7 +179,7 @@ namespace osu.Game.Users
         private UserStatistics statistics;
 
         /// <summary>
-        /// User statistics for the requested ruleset (in the case of a <see cref="GetUserRequest"/> response).
+        /// User statistics for the requested ruleset (in the case of a <see cref="GetUserRequest"/> or <see cref="GetFriendsRequest"/> response).
         /// Otherwise empty.
         /// </summary>
         [JsonProperty(@"statistics")]

osu.Game/Users/UserStatistics.cs

@@ -29,16 +29,9 @@ namespace osu.Game.Users
         [JsonProperty(@"global_rank")]
         public int? GlobalRank;
 
+        [JsonProperty(@"country_rank")]
         public int? CountryRank;
 
-        [JsonProperty(@"rank")]
-        private UserRanks ranks
-        {
-            // eventually that will also become an own json property instead of reading from a `rank` object.
-            // see https://github.com/ppy/osu-web/blob/cb79bb72186c8f1a25f6a6f5ef315123decb4231/app/Transformers/UserStatisticsTransformer.php#L53.
-            set => CountryRank = value.Country;
-        }
-
         // populated via User model, as that's where the data currently lives.
         public RankHistoryData RankHistory;
 
@@ -119,13 +112,5 @@ namespace osu.Game.Users
                 }
             }
         }
-
-#pragma warning disable 649
-        private struct UserRanks
-        {
-            [JsonProperty(@"country")]
-            public int? Country;
-        }
-#pragma warning restore 649
     }
 }