From aa6763785c00a50d1624b1aebe2a400d63273fa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Mon, 30 Dec 2024 03:21:52 +0100
Subject: [PATCH] Use 3x speed instead when beat snap divisor is divisible by 3

---
 osu.Game/Screens/Edit/Timing/MetronomeDisplay.cs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/MetronomeDisplay.cs b/osu.Game/Screens/Edit/Timing/MetronomeDisplay.cs
index 44553a92d4..553eacab46 100644
--- a/osu.Game/Screens/Edit/Timing/MetronomeDisplay.cs
+++ b/osu.Game/Screens/Edit/Timing/MetronomeDisplay.cs
@@ -42,6 +42,9 @@ namespace osu.Game.Screens.Edit.Timing
         [Resolved]
         private OverlayColourProvider overlayColourProvider { get; set; } = null!;
 
+        [Resolved]
+        private BindableBeatDivisor beatDivisor { get; set; } = null!;
+
         public bool EnableClicking
         {
             get => metronomeTick.EnableClicking;
@@ -233,10 +236,17 @@ namespace osu.Game.Screens.Edit.Timing
 
         private ScheduledDelegate? latchDelegate;
 
+        private bool spedUp;
+
         private bool divisorChanged;
 
-        private void setDivisor(int divisor)
+        private void updateDivisor()
         {
+            int divisor = 1;
+
+            if (spedUp)
+                divisor = beatDivisor.Value % 3 == 0 ? 3 : 2;
+
             if (divisor == Divisor)
                 return;
 
@@ -264,6 +274,8 @@ namespace osu.Game.Screens.Edit.Timing
 
             timingPoint = BeatSyncSource.ControlPoints.TimingPointAt(BeatSyncSource.Clock.CurrentTime);
 
+            updateDivisor();
+
             if (beatLength != timingPoint.BeatLength || divisorChanged)
             {
                 beatLength = timingPoint.BeatLength;
@@ -346,7 +358,7 @@ namespace osu.Game.Screens.Edit.Timing
             updateDivisorFromKey(e);
         }
 
-        private void updateDivisorFromKey(UIEvent e) => setDivisor(e.ControlPressed ? 2 : 1);
+        private void updateDivisorFromKey(UIEvent e) => spedUp = e.ControlPressed;
 
         private partial class MetronomeTick : BeatSyncedContainer
         {