From 99ba7c29dd99c92bd29396e276558206bc62076b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Nov 2022 13:46:50 +0900
Subject: [PATCH] Change range to 0-100% and rename to "normalisation"

---
 osu.Game/Configuration/OsuConfigManager.cs                | 4 ++--
 .../Settings/Sections/Gameplay/BeatmapSettings.cs         | 8 ++++----
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs  | 6 ++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 0d56ab8962..98776c7487 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -175,7 +175,7 @@ namespace osu.Game.Configuration
 
             SetDefault(OsuSetting.LastProcessedMetadataId, -1);
 
-            SetDefault(OsuSetting.ComboColourBrightness, 0f, -1f, 1f, 1f);
+            SetDefault(OsuSetting.ComboColourNormalisation, 0.2f, 0f, 1f, 0.01f);
         }
 
         protected override bool CheckLookupContainsPrivateInformation(OsuSetting lookup)
@@ -367,6 +367,6 @@ namespace osu.Game.Configuration
         ShowOnlineExplicitContent,
         LastProcessedMetadataId,
         SafeAreaConsiderations,
-        ComboColourBrightness,
+        ComboColourNormalisation,
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs
index 8bfa3e502c..ab9be70a5b 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs
@@ -16,12 +16,12 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
     {
         protected override LocalisableString Header => GameplaySettingsStrings.BeatmapHeader;
 
-        private readonly BindableFloat comboColourBrightness = new BindableFloat();
+        private readonly BindableFloat comboColourNormalisation = new BindableFloat();
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            config.BindWith(OsuSetting.ComboColourBrightness, comboColourBrightness);
+            config.BindWith(OsuSetting.ComboColourNormalisation, comboColourNormalisation);
 
             Children = new Drawable[]
             {
@@ -47,8 +47,8 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 },
                 new SettingsSlider<float>
                 {
-                    LabelText = "Combo colour brightness",
-                    Current = comboColourBrightness,
+                    LabelText = "Combo colour normalisation",
+                    Current = comboColourNormalisation,
                     DisplayAsPercentage = true,
                 }
             };
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 077606cb3a..98fd73c8e9 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -175,7 +175,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         private void load(OsuConfigManager config, ISkinSource skinSource)
         {
             config.BindWith(OsuSetting.PositionalHitsoundsLevel, positionalHitsoundsLevel);
-            config.BindWith(OsuSetting.ComboColourBrightness, comboColourBrightness);
+            config.BindWith(OsuSetting.ComboColourNormalisation, comboColourBrightness);
 
             // Explicit non-virtual function call in case a DrawableHitObject overrides AddInternal.
             base.AddInternal(Samples = new PausableSkinnableSound());
@@ -524,9 +524,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             // Normalise the combo colour to the given brightness level.
             if (comboColourBrightness.Value != 0)
             {
-                float pAdjust = 0.6f + 0.4f * comboColourBrightness.Value;
-
-                colour = Interpolation.ValueAt(Math.Abs(comboColourBrightness.Value), colour, new HSPAColour(colour) { P = pAdjust }.ToColor4(), 0, 1, Easing.Out);
+                colour = Interpolation.ValueAt(Math.Abs(comboColourBrightness.Value), colour, new HSPAColour(colour) { P = 0.6f }.ToColor4(), 0, 1);
             }
 
             AccentColour.Value = colour;