Apply migration to new standardised score on normal reimport too

osu.Game/Database/RealmAccess.cs

@@ -77,8 +77,9 @@ namespace osu.Game.Database
         /// 27   2023-06-06    Added EditorTimestamp to BeatmapInfo.
         /// 28   2023-06-08    Added IsLegacyScore to ScoreInfo, parsed from replay files.
         /// 29   2023-06-12    Run migration of old lazer scores to be best-effort in the new scoring number space. No actual realm changes.
+        /// 30   2023-06-16    Run migration of old lazer scores again. This time with more correct rounding considerations.
         /// </summary>
-        private const int schema_version = 29;
+        private const int schema_version = 30;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
@@ -938,6 +939,7 @@ namespace osu.Game.Database
                 }
 
                 case 29:
+                case 30:
                 {
                     var scores = migration.NewRealm
                                           .All<ScoreInfo>()
@@ -947,12 +949,7 @@ namespace osu.Game.Database
                     {
                         try
                         {
-                            // Recalculate the old-style standardised score to see if this was an old lazer score.
-                            bool oldScoreMatchesExpectations = StandardisedScoreMigrationTools.GetOldStandardised(score) == score.TotalScore;
-                            // Some older scores don't have correct statistics populated, so let's give them benefit of doubt.
-                            bool scoreIsVeryOld = score.Date < new DateTime(2023, 1, 1, 0, 0, 0);
-
-                            if (oldScoreMatchesExpectations || scoreIsVeryOld)
+                            if (StandardisedScoreMigrationTools.ShouldMigrateToNewStandardised(score))
                             {
                                 try
                                 {

osu.Game/Database/StandardisedScoreMigrationTools.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
@@ -13,6 +14,19 @@ namespace osu.Game.Database
 {
     public static class StandardisedScoreMigrationTools
     {
+        public static bool ShouldMigrateToNewStandardised(ScoreInfo score)
+        {
+            if (score.IsLegacyScore)
+                return false;
+
+            // Recalculate the old-style standardised score to see if this was an old lazer score.
+            bool oldScoreMatchesExpectations = GetOldStandardised(score) == score.TotalScore;
+            // Some older scores don't have correct statistics populated, so let's give them benefit of doubt.
+            bool scoreIsVeryOld = score.Date < new DateTime(2023, 1, 1, 0, 0, 0);
+
+            return oldScoreMatchesExpectations || scoreIsVeryOld;
+        }
+
         public static long GetNewStandardised(ScoreInfo score)
         {
             int maxJudgementIndex = 0;
@@ -168,7 +182,7 @@ namespace osu.Game.Database
             foreach (var mod in score.Mods)
                 modMultiplier *= mod.ScoreMultiplier;
 
-            return (long)((1000000 * (accuracyPortion * accuracyScore + (1 - accuracyPortion) * comboScore) + bonusScore) * modMultiplier);
+            return (long)Math.Round((1000000 * (accuracyPortion * accuracyScore + (1 - accuracyPortion) * comboScore) + bonusScore) * modMultiplier);
         }
 
         private class FakeHit : HitObject

osu.Game/Scoring/ScoreImporter.cs

@@ -83,6 +83,11 @@ namespace osu.Game.Scoring
 
             if (string.IsNullOrEmpty(model.MaximumStatisticsJson))
                 model.MaximumStatisticsJson = JsonConvert.SerializeObject(model.MaximumStatistics);
+
+            // for pre-ScoreV2 lazer scores, apply a best-effort conversion of total score to ScoreV2.
+            // this requires: max combo, statistics, max statistics (where available), and mods to already be populated on the score.
+            if (StandardisedScoreMigrationTools.ShouldMigrateToNewStandardised(model))
+                model.TotalScore = StandardisedScoreMigrationTools.GetNewStandardised(model);
         }
 
         /// <summary>