From 2a28c5f4de158ef1e57d5dd1aa80bbcdfcdb2449 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Jan 2025 16:20:21 +0900
Subject: [PATCH] Add static memory of last applied offset score

I don't really like adding this new session static, but we don't have a
better place to put this.
---
 osu.Game/Configuration/SessionStatics.cs       |  6 ++++++
 .../PlayerSettings/BeatmapOffsetControl.cs     | 18 +++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 225f209380..c55a597c32 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -29,6 +29,7 @@ namespace osu.Game.Configuration
             SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
             SetDefault(Static.TouchInputActive, RuntimeInfo.IsMobile);
             SetDefault<ScoreInfo>(Static.LastLocalUserScore, null);
+            SetDefault<ScoreInfo>(Static.LastAppliedOffsetScore, null);
         }
 
         /// <summary>
@@ -81,6 +82,11 @@ namespace osu.Game.Configuration
         /// </summary>
         LastLocalUserScore,
 
+        /// <summary>
+        /// Stores the local user's last score which was used to apply an offset.
+        /// </summary>
+        LastAppliedOffsetScore,
+
         /// <summary>
         /// Whether the intro animation for the daily challenge screen has been played once.
         /// This is reset when a new challenge is up.
diff --git a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
index 74b887481f..f93fa1b3c5 100644
--- a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
@@ -15,6 +15,7 @@ using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -36,6 +37,8 @@ namespace osu.Game.Screens.Play.PlayerSettings
     {
         public Bindable<ScoreInfo?> ReferenceScore { get; } = new Bindable<ScoreInfo?>();
 
+        private Bindable<ScoreInfo?> lastAppliedScore { get; } = new Bindable<ScoreInfo?>();
+
         public BindableDouble Current { get; } = new BindableDouble
         {
             MinValue = -50,
@@ -100,6 +103,12 @@ namespace osu.Game.Screens.Play.PlayerSettings
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load(SessionStatics statics)
+        {
+            statics.BindWith(Static.LastAppliedOffsetScore, lastAppliedScore);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -176,6 +185,9 @@ namespace osu.Game.Screens.Play.PlayerSettings
             if (score.NewValue == null)
                 return;
 
+            if (score.NewValue.Equals(lastAppliedScore.Value))
+                return;
+
             if (!score.NewValue.BeatmapInfo.AsNonNull().Equals(beatmap.Value.BeatmapInfo))
                 return;
 
@@ -230,7 +242,11 @@ namespace osu.Game.Screens.Play.PlayerSettings
                 useAverageButton = new SettingsButton
                 {
                     Text = BeatmapOffsetControlStrings.CalibrateUsingLastPlay,
-                    Action = () => Current.Value = lastPlayBeatmapOffset - lastPlayAverage,
+                    Action = () =>
+                    {
+                        Current.Value = lastPlayBeatmapOffset - lastPlayAverage;
+                        lastAppliedScore.Value = ReferenceScore.Value;
+                    },
                     Enabled = { Value = !Precision.AlmostEquals(lastPlayAverage, 0, Current.Precision / 2) }
                 },
                 globalOffsetText = new LinkFlowContainer