From 3db0e7cd75d55126d45b94661a865b17a1b8babd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Sep 2020 22:34:57 +0200
Subject: [PATCH] Generalise LegacyRollingCounter

---
 .../Skinning/LegacyComboCounter.cs            | 33 ------------
 osu.Game/Skinning/LegacyRollingCounter.cs     | 51 +++++++++++++++++++
 2 files changed, 51 insertions(+), 33 deletions(-)
 create mode 100644 osu.Game/Skinning/LegacyRollingCounter.cs

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
index e03b30f58f..ccfabdc5fd 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyComboCounter.cs
@@ -1,13 +1,10 @@
 // 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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
@@ -128,35 +125,5 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
             lastExplosion = explosion;
         }
-
-        private class LegacyRollingCounter : RollingCounter<int>
-        {
-            private readonly ISkin skin;
-
-            private readonly string fontName;
-            private readonly float fontOverlap;
-
-            protected override bool IsRollingProportional => true;
-
-            public LegacyRollingCounter(ISkin skin, string fontName, float fontOverlap)
-            {
-                this.skin = skin;
-                this.fontName = fontName;
-                this.fontOverlap = fontOverlap;
-            }
-
-            protected override double GetProportionalDuration(int currentValue, int newValue)
-            {
-                return Math.Abs(newValue - currentValue) * 75.0;
-            }
-
-            protected override OsuSpriteText CreateSpriteText()
-            {
-                return new LegacySpriteText(skin, fontName)
-                {
-                    Spacing = new Vector2(-fontOverlap, 0f)
-                };
-            }
-        }
     }
 }
diff --git a/osu.Game/Skinning/LegacyRollingCounter.cs b/osu.Game/Skinning/LegacyRollingCounter.cs
new file mode 100644
index 0000000000..8aa9d4e9af
--- /dev/null
+++ b/osu.Game/Skinning/LegacyRollingCounter.cs
@@ -0,0 +1,51 @@
+// 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 osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+
+namespace osu.Game.Skinning
+{
+    /// <summary>
+    /// An integer <see cref="RollingCounter{T}"/> that uses number sprites from a legacy skin.
+    /// </summary>
+    public class LegacyRollingCounter : RollingCounter<int>
+    {
+        private readonly ISkin skin;
+
+        private readonly string fontName;
+        private readonly float fontOverlap;
+
+        protected override bool IsRollingProportional => true;
+
+        /// <summary>
+        /// Creates a new <see cref="LegacyRollingCounter"/>.
+        /// </summary>
+        /// <param name="skin">The <see cref="ISkin"/> from which to get counter number sprites.</param>
+        /// <param name="fontName">The name of the legacy font to use.</param>
+        /// <param name="fontOverlap">
+        /// The numeric overlap of number sprites to use.
+        /// A positive number will bring the number sprites closer together, while a negative number
+        /// will split them apart more.
+        /// </param>
+        public LegacyRollingCounter(ISkin skin, string fontName, float fontOverlap)
+        {
+            this.skin = skin;
+            this.fontName = fontName;
+            this.fontOverlap = fontOverlap;
+        }
+
+        protected override double GetProportionalDuration(int currentValue, int newValue)
+        {
+            return Math.Abs(newValue - currentValue) * 75.0;
+        }
+
+        protected sealed override OsuSpriteText CreateSpriteText() =>
+            new LegacySpriteText(skin, fontName)
+            {
+                Spacing = new Vector2(-fontOverlap, 0f)
+            };
+    }
+}