From f73076918607487569b5aaf66283fbc0fbc27ed8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 May 2017 12:54:56 +0900
Subject: [PATCH] Rewrite to make better

---
 osu.Game/Database/BeatmapDifficulty.cs     | 13 ++++++---
 osu.Game/Graphics/Cursor/GameplayCursor.cs | 32 ++++++++++++++--------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Database/BeatmapDifficulty.cs b/osu.Game/Database/BeatmapDifficulty.cs
index 7c9f47e7b6..cf1305f705 100644
--- a/osu.Game/Database/BeatmapDifficulty.cs
+++ b/osu.Game/Database/BeatmapDifficulty.cs
@@ -7,12 +7,17 @@ namespace osu.Game.Database
 {
     public class BeatmapDifficulty
     {
+        /// <summary>
+        /// The default value used for all difficulty settings except <see cref="SliderMultiplier"/> and <see cref="SliderTickRate"/>.
+        /// </summary>
+        public const float DEFAULT_DIFFICULTY = 5;
+
         [PrimaryKey, AutoIncrement]
         public int ID { get; set; }
-        public float DrainRate { get; set; } = 5;
-        public float CircleSize { get; set; } = 5;
-        public float OverallDifficulty { get; set; } = 5;
-        public float ApproachRate { get; set; } = 5;
+        public float DrainRate { get; set; } = DEFAULT_DIFFICULTY;
+        public float CircleSize { get; set; } = DEFAULT_DIFFICULTY;
+        public float OverallDifficulty { get; set; } = DEFAULT_DIFFICULTY;
+        public float ApproachRate { get; set; } = DEFAULT_DIFFICULTY;
         public float SliderMultiplier { get; set; } = 1;
         public float SliderTickRate { get; set; } = 1;
 
diff --git a/osu.Game/Graphics/Cursor/GameplayCursor.cs b/osu.Game/Graphics/Cursor/GameplayCursor.cs
index 766371c07d..801fe1d011 100644
--- a/osu.Game/Graphics/Cursor/GameplayCursor.cs
+++ b/osu.Game/Graphics/Cursor/GameplayCursor.cs
@@ -11,7 +11,9 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
+using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Database;
 
 namespace osu.Game.Graphics.Cursor
 {
@@ -41,14 +43,10 @@ namespace osu.Game.Graphics.Cursor
         public class OsuCursor : Container
         {
             private Container cursorContainer;
+
             private Bindable<double> cursorScale;
             private Bindable<bool> autoCursorScale;
-
-
-            private float beatmapCircleSize;
-            private const int default_circle_size = 5;
-            private float autoScaleMultiplier => autoCursorScale ? (float)(1 - 0.7 * (beatmapCircleSize - 4) / 5) : 1f;
-
+            private Bindable<WorkingBeatmap> beatmap;
 
             public OsuCursor()
             {
@@ -121,19 +119,29 @@ namespace osu.Game.Graphics.Cursor
                     },
                 };
 
-                beatmapCircleSize = game.Beatmap.Value?.Beatmap.BeatmapInfo.Difficulty.CircleSize ?? default_circle_size;
+                beatmap = game.Beatmap.GetBoundCopy();
+                beatmap.ValueChanged += v => calculateScale();
 
                 cursorScale = config.GetBindable<double>(OsuSetting.GameplayCursorSize);
-                autoCursorScale = config.GetBindable<bool>(OsuSetting.AutoCursorSize);
+                cursorScale.ValueChanged += v => calculateScale();
 
-                cursorScale.ValueChanged += newValue => calculateScale();
-                autoCursorScale.ValueChanged += newValue => calculateScale();
-                cursorScale.TriggerChange();
+                autoCursorScale = config.GetBindable<bool>(OsuSetting.AutoCursorSize);
+                autoCursorScale.ValueChanged += v => calculateScale();
+
+                calculateScale();
             }
 
             private void calculateScale()
             {
-                cursorContainer.Scale = new Vector2((float)(autoScaleMultiplier * cursorScale));
+                float scale = (float)cursorScale.Value;
+
+                if (autoCursorScale && beatmap.Value != null)
+                {
+                    // if we have a beatmap available, let's get its circle size to figure out an automatic cursor scale modifier.
+                    scale *= (float)(1 - 0.7 * (1 + beatmap.Value.BeatmapInfo.Difficulty.CircleSize - BeatmapDifficulty.DEFAULT_DIFFICULTY) / BeatmapDifficulty.DEFAULT_DIFFICULTY);
+                }
+
+                cursorContainer.Scale = new Vector2(scale);
             }
         }
     }