From f849b4ce54e4b8e75a8286192b4dfbae24f80e25 Mon Sep 17 00:00:00 2001
From: Desconocidosmh <Desconocidosmh@users.noreply.github.com>
Date: Wed, 14 Aug 2019 19:49:32 +0200
Subject: [PATCH 01/18] Make autoplay unpress sooner, if needed

---
 .../Replays/TaikoAutoGenerator.cs                   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index 422ba748e3..60fd88882e 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -113,14 +113,21 @@ namespace osu.Game.Rulesets.Taiko.Replays
                 else
                     throw new InvalidOperationException("Unknown hit object type.");
 
-                Frames.Add(new TaikoReplayFrame(endTime + KEY_UP_DELAY));
-
                 if (i < Beatmap.HitObjects.Count - 1)
                 {
-                    double waitTime = Beatmap.HitObjects[i + 1].StartTime - 1000;
+                    var nextHitObject = Beatmap.HitObjects[i + 1];
+
+                    if (!(nextHitObject.StartTime < endTime + KEY_UP_DELAY))
+                        Frames.Add(new TaikoReplayFrame(endTime + KEY_UP_DELAY));
+
+                    double waitTime = nextHitObject.StartTime - 1000;
                     if (waitTime > endTime)
                         Frames.Add(new TaikoReplayFrame(waitTime));
                 }
+                else
+                {
+                    Frames.Add(new TaikoReplayFrame(endTime + KEY_UP_DELAY));
+                }
 
                 hitButton = !hitButton;
             }

From e567e81981d6f940a9de97d68a3bab496e6d29cc Mon Sep 17 00:00:00 2001
From: Desconocidosmh <Desconocidosmh@users.noreply.github.com>
Date: Wed, 14 Aug 2019 20:10:52 +0200
Subject: [PATCH 02/18] Refactoring

---
 osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index 60fd88882e..014511d090 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -117,7 +117,7 @@ namespace osu.Game.Rulesets.Taiko.Replays
                 {
                     var nextHitObject = Beatmap.HitObjects[i + 1];
 
-                    if (!(nextHitObject.StartTime < endTime + KEY_UP_DELAY))
+                    if (nextHitObject.StartTime > endTime + KEY_UP_DELAY)
                         Frames.Add(new TaikoReplayFrame(endTime + KEY_UP_DELAY));
 
                     double waitTime = nextHitObject.StartTime - 1000;

From ba539abac77484c3dd5103333e84231a46d81cf2 Mon Sep 17 00:00:00 2001
From: Desconocidosmh <Desconocidosmh@users.noreply.github.com>
Date: Wed, 14 Aug 2019 21:05:24 +0200
Subject: [PATCH 03/18] Refactoring

---
 .../Replays/TaikoAutoGenerator.cs             | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index 014511d090..a46ecab6f0 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -113,21 +113,23 @@ namespace osu.Game.Rulesets.Taiko.Replays
                 else
                     throw new InvalidOperationException("Unknown hit object type.");
 
+                TaikoHitObject nextHitObject;
                 if (i < Beatmap.HitObjects.Count - 1)
+                    nextHitObject = Beatmap.HitObjects[i + 1];
+                else
+                    nextHitObject = null;
+
+                bool canDelayKeyUp = nextHitObject != null && nextHitObject.StartTime > endTime + KEY_UP_DELAY;
+
+                if (canDelayKeyUp)
+                    Frames.Add(new TaikoReplayFrame(endTime + KEY_UP_DELAY));
+
+                if (nextHitObject != null)
                 {
-                    var nextHitObject = Beatmap.HitObjects[i + 1];
-
-                    if (nextHitObject.StartTime > endTime + KEY_UP_DELAY)
-                        Frames.Add(new TaikoReplayFrame(endTime + KEY_UP_DELAY));
-
                     double waitTime = nextHitObject.StartTime - 1000;
                     if (waitTime > endTime)
                         Frames.Add(new TaikoReplayFrame(waitTime));
                 }
-                else
-                {
-                    Frames.Add(new TaikoReplayFrame(endTime + KEY_UP_DELAY));
-                }
 
                 hitButton = !hitButton;
             }

From 386d78881394f344ab87054b926bbe3eb6963a81 Mon Sep 17 00:00:00 2001
From: Desconocidosmh <Desconocidosmh@users.noreply.github.com>
Date: Thu, 15 Aug 2019 18:32:45 +0200
Subject: [PATCH 04/18] Change if-else to ternary if

---
 osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index a46ecab6f0..6326c3a044 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -113,11 +113,7 @@ namespace osu.Game.Rulesets.Taiko.Replays
                 else
                     throw new InvalidOperationException("Unknown hit object type.");
 
-                TaikoHitObject nextHitObject;
-                if (i < Beatmap.HitObjects.Count - 1)
-                    nextHitObject = Beatmap.HitObjects[i + 1];
-                else
-                    nextHitObject = null;
+                TaikoHitObject nextHitObject = i < Beatmap.HitObjects.Count - 1 ? Beatmap.HitObjects[i + 1] : null;
 
                 bool canDelayKeyUp = nextHitObject != null && nextHitObject.StartTime > endTime + KEY_UP_DELAY;
 

From aa3651f65eb98777c6254ae29e2512f2db098ba4 Mon Sep 17 00:00:00 2001
From: Desconocidosmh <Desconocidosmh@users.noreply.github.com>
Date: Thu, 15 Aug 2019 19:45:10 +0200
Subject: [PATCH 05/18] Change the logic so the last button gets unpressed
 instead of staying pressed forever

---
 osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index 6326c3a044..1d35393de0 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Rulesets.Taiko.Replays
 
                 TaikoHitObject nextHitObject = i < Beatmap.HitObjects.Count - 1 ? Beatmap.HitObjects[i + 1] : null;
 
-                bool canDelayKeyUp = nextHitObject != null && nextHitObject.StartTime > endTime + KEY_UP_DELAY;
+                bool canDelayKeyUp = nextHitObject == null || nextHitObject.StartTime > endTime + KEY_UP_DELAY;
 
                 if (canDelayKeyUp)
                     Frames.Add(new TaikoReplayFrame(endTime + KEY_UP_DELAY));

From 24d2b504dd4ce36f2e128a28075444f69860de73 Mon Sep 17 00:00:00 2001
From: Desconocidosmh <Desconocidosmh@users.noreply.github.com>
Date: Fri, 16 Aug 2019 12:39:54 +0200
Subject: [PATCH 06/18] Stop autoplay from missing on very dense notes when
 playing mania

---
 .../Replays/ManiaAutoGenerator.cs             | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
index e5669816fa..49bb47cc2b 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Replays;
 
@@ -77,10 +78,35 @@ namespace osu.Game.Rulesets.Mania.Replays
 
         private IEnumerable<IActionPoint> generateActionPoints()
         {
-            foreach (var obj in Beatmap.HitObjects)
+            for (int i = 0; i < Beatmap.HitObjects.Count; i++)
             {
-                yield return new HitPoint { Time = obj.StartTime, Column = obj.Column };
-                yield return new ReleasePoint { Time = ((obj as IHasEndTime)?.EndTime ?? obj.StartTime) + RELEASE_DELAY, Column = obj.Column };
+                var currentObject = Beatmap.HitObjects[i];
+
+                double endTime = (currentObject as IHasEndTime)?.EndTime ?? currentObject.StartTime;
+
+                var nextObjectInTheSameColumn = getNextObjectInTheSameColumn(i);
+
+                bool canDelayKeyUp = nextObjectInTheSameColumn == null ||
+                                     nextObjectInTheSameColumn.StartTime > endTime + KEY_UP_DELAY;
+
+                double releaseDelay = canDelayKeyUp ? RELEASE_DELAY : nextObjectInTheSameColumn.StartTime - endTime - 1;
+
+                yield return new HitPoint { Time = currentObject.StartTime, Column = currentObject.Column };
+
+                yield return new ReleasePoint { Time = endTime + releaseDelay, Column = currentObject.Column };
+            }
+
+            ManiaHitObject getNextObjectInTheSameColumn(int currentIndex)
+            {
+                int desiredColumn = Beatmap.HitObjects[currentIndex++].Column;
+
+                for (; currentIndex < Beatmap.HitObjects.Count; currentIndex++)
+                {
+                    if (Beatmap.HitObjects[currentIndex].Column == desiredColumn)
+                        return Beatmap.HitObjects[currentIndex];
+                }
+
+                return null;
             }
         }
 

From 7de1757aae1bae0baf006a010cd3be4eb172da62 Mon Sep 17 00:00:00 2001
From: Desconocidosmh <Desconocidosmh@users.noreply.github.com>
Date: Fri, 16 Aug 2019 12:50:48 +0200
Subject: [PATCH 07/18] Small improvements

---
 osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
index 49bb47cc2b..4fea834748 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
@@ -81,19 +81,18 @@ namespace osu.Game.Rulesets.Mania.Replays
             for (int i = 0; i < Beatmap.HitObjects.Count; i++)
             {
                 var currentObject = Beatmap.HitObjects[i];
+                var nextObjectInTheSameColumn = getNextObjectInTheSameColumn(i);
 
                 double endTime = (currentObject as IHasEndTime)?.EndTime ?? currentObject.StartTime;
 
-                var nextObjectInTheSameColumn = getNextObjectInTheSameColumn(i);
-
                 bool canDelayKeyUp = nextObjectInTheSameColumn == null ||
                                      nextObjectInTheSameColumn.StartTime > endTime + KEY_UP_DELAY;
 
-                double releaseDelay = canDelayKeyUp ? RELEASE_DELAY : nextObjectInTheSameColumn.StartTime - endTime - 1;
+                double calculatedDelay = canDelayKeyUp ? RELEASE_DELAY : (nextObjectInTheSameColumn.StartTime - endTime) * 0.9;
 
                 yield return new HitPoint { Time = currentObject.StartTime, Column = currentObject.Column };
 
-                yield return new ReleasePoint { Time = endTime + releaseDelay, Column = currentObject.Column };
+                yield return new ReleasePoint { Time = endTime + calculatedDelay, Column = currentObject.Column };
             }
 
             ManiaHitObject getNextObjectInTheSameColumn(int currentIndex)

From 0f9706e7985428f1273fd23a9b0e3925dbf1f357 Mon Sep 17 00:00:00 2001
From: Desconocidosmh <Desconocidosmh@users.noreply.github.com>
Date: Sat, 17 Aug 2019 00:18:25 +0200
Subject: [PATCH 08/18] Fix using invalid constant

---
 osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
index 4fea834748..43150958d0 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Mania.Replays
                 double endTime = (currentObject as IHasEndTime)?.EndTime ?? currentObject.StartTime;
 
                 bool canDelayKeyUp = nextObjectInTheSameColumn == null ||
-                                     nextObjectInTheSameColumn.StartTime > endTime + KEY_UP_DELAY;
+                                     nextObjectInTheSameColumn.StartTime > endTime + RELEASE_DELAY;
 
                 double calculatedDelay = canDelayKeyUp ? RELEASE_DELAY : (nextObjectInTheSameColumn.StartTime - endTime) * 0.9;
 

From b3556403aac6af43614e429054a4b6672583b700 Mon Sep 17 00:00:00 2001
From: Desconocidosmh <Desconocidosmh@users.noreply.github.com>
Date: Mon, 19 Aug 2019 16:18:25 +0200
Subject: [PATCH 09/18] Make GetNextObject() a virtual method

---
 .../Replays/ManiaAutoGenerator.cs             | 24 ++++++++---------
 .../Replays/TaikoAutoGenerator.cs             | 26 +++++++++++++++----
 osu.Game/Rulesets/Replays/AutoGenerator.cs    |  9 +++++++
 3 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
index 43150958d0..b9dd32208e 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Replays;
 
@@ -81,7 +81,7 @@ namespace osu.Game.Rulesets.Mania.Replays
             for (int i = 0; i < Beatmap.HitObjects.Count; i++)
             {
                 var currentObject = Beatmap.HitObjects[i];
-                var nextObjectInTheSameColumn = getNextObjectInTheSameColumn(i);
+                var nextObjectInTheSameColumn = GetNextObject(i);
 
                 double endTime = (currentObject as IHasEndTime)?.EndTime ?? currentObject.StartTime;
 
@@ -94,19 +94,19 @@ namespace osu.Game.Rulesets.Mania.Replays
 
                 yield return new ReleasePoint { Time = endTime + calculatedDelay, Column = currentObject.Column };
             }
+        }
 
-            ManiaHitObject getNextObjectInTheSameColumn(int currentIndex)
+        protected override HitObject GetNextObject(int currentIndex)
+        {
+            int desiredColumn = Beatmap.HitObjects[currentIndex++].Column;
+
+            for (; currentIndex < Beatmap.HitObjects.Count; currentIndex++)
             {
-                int desiredColumn = Beatmap.HitObjects[currentIndex++].Column;
-
-                for (; currentIndex < Beatmap.HitObjects.Count; currentIndex++)
-                {
-                    if (Beatmap.HitObjects[currentIndex].Column == desiredColumn)
-                        return Beatmap.HitObjects[currentIndex];
-                }
-
-                return null;
+                if (Beatmap.HitObjects[currentIndex].Column == desiredColumn)
+                    return Beatmap.HitObjects[currentIndex];
             }
+
+            return null;
         }
 
         private interface IActionPoint
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index 1d35393de0..67f93a0259 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -10,6 +10,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Taiko.Beatmaps;
+using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Replays
 {
@@ -113,16 +114,17 @@ namespace osu.Game.Rulesets.Taiko.Replays
                 else
                     throw new InvalidOperationException("Unknown hit object type.");
 
-                TaikoHitObject nextHitObject = i < Beatmap.HitObjects.Count - 1 ? Beatmap.HitObjects[i + 1] : null;
+                var nextHitObject = GetNextObject(i);
 
                 bool canDelayKeyUp = nextHitObject == null || nextHitObject.StartTime > endTime + KEY_UP_DELAY;
 
-                if (canDelayKeyUp)
-                    Frames.Add(new TaikoReplayFrame(endTime + KEY_UP_DELAY));
+                double calculatedDelay = canDelayKeyUp ? KEY_UP_DELAY : nextHitObject.StartTime - endTime;
 
-                if (nextHitObject != null)
+                Frames.Add(new TaikoReplayFrame(endTime + calculatedDelay));
+
+                if (i < Beatmap.HitObjects.Count - 1)
                 {
-                    double waitTime = nextHitObject.StartTime - 1000;
+                    double waitTime = Beatmap.HitObjects[i + 1].StartTime - 1000;
                     if (waitTime > endTime)
                         Frames.Add(new TaikoReplayFrame(waitTime));
                 }
@@ -132,5 +134,19 @@ namespace osu.Game.Rulesets.Taiko.Replays
 
             return Replay;
         }
+
+        protected override HitObject GetNextObject(int currentIndex)
+        {
+            Type desiredType = Beatmap.HitObjects[currentIndex++].GetType();
+
+            for (; currentIndex < Beatmap.HitObjects.Count; currentIndex++)
+            {
+                var currentObj = Beatmap.HitObjects[currentIndex];
+                if (currentObj.GetType().Equals(desiredType) || currentObj is DrumRoll)
+                    return Beatmap.HitObjects[currentIndex];
+            }
+
+            return null;
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Replays/AutoGenerator.cs b/osu.Game/Rulesets/Replays/AutoGenerator.cs
index 1d4cdbf04c..3319f30a6f 100644
--- a/osu.Game/Rulesets/Replays/AutoGenerator.cs
+++ b/osu.Game/Rulesets/Replays/AutoGenerator.cs
@@ -3,6 +3,7 @@
 
 using osu.Game.Beatmaps;
 using osu.Game.Replays;
+using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Replays
 {
@@ -34,5 +35,13 @@ namespace osu.Game.Rulesets.Replays
         protected const double KEY_UP_DELAY = 50;
 
         #endregion
+
+        protected virtual HitObject GetNextObject(int currentIndex)
+        {
+            if (currentIndex >= Beatmap.HitObjects.Count - 1)
+                return null;
+
+            return Beatmap.HitObjects[currentIndex + 1];
+        }
     }
 }

From eb83e36e0f85dc3b0ca6f4f6ce1c138b6ecc938c Mon Sep 17 00:00:00 2001
From: Desconocidosmh <Desconocidosmh@users.noreply.github.com>
Date: Mon, 19 Aug 2019 17:05:25 +0200
Subject: [PATCH 10/18] Make TaikoAutoGenerator unpress sooner

---
 osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index 67f93a0259..463bb84d07 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Rulesets.Taiko.Replays
 
                 bool canDelayKeyUp = nextHitObject == null || nextHitObject.StartTime > endTime + KEY_UP_DELAY;
 
-                double calculatedDelay = canDelayKeyUp ? KEY_UP_DELAY : nextHitObject.StartTime - endTime;
+                double calculatedDelay = canDelayKeyUp ? KEY_UP_DELAY : (nextHitObject.StartTime - endTime) * 0.9;
 
                 Frames.Add(new TaikoReplayFrame(endTime + calculatedDelay));
 

From 9732f5d6226f739c51e6cae81b706581d5c0291d Mon Sep 17 00:00:00 2001
From: Desconocidosmh <Desconocidosmh@users.noreply.github.com>
Date: Mon, 19 Aug 2019 17:28:32 +0200
Subject: [PATCH 11/18] Add Swell to GetNextObject() check

---
 osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index 463bb84d07..fbc7b75854 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -142,7 +142,8 @@ namespace osu.Game.Rulesets.Taiko.Replays
             for (; currentIndex < Beatmap.HitObjects.Count; currentIndex++)
             {
                 var currentObj = Beatmap.HitObjects[currentIndex];
-                if (currentObj.GetType().Equals(desiredType) || currentObj is DrumRoll)
+                if (currentObj.GetType().Equals(desiredType) ||
+                    currentObj is DrumRoll || currentObj is Swell) // It's best to unpress any remaining keys before DrumRoll or Swell
                     return Beatmap.HitObjects[currentIndex];
             }
 

From 9bd844bf4d41c6dd9b82aa7cbc27079b738b35d2 Mon Sep 17 00:00:00 2001
From: Desconocidosmh <Desconocidosmh@users.noreply.github.com>
Date: Mon, 19 Aug 2019 19:54:22 +0200
Subject: [PATCH 12/18] Make comment more informative

---
 osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index fbc7b75854..4d6730c0e6 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Rulesets.Taiko.Replays
             {
                 var currentObj = Beatmap.HitObjects[currentIndex];
                 if (currentObj.GetType().Equals(desiredType) ||
-                    currentObj is DrumRoll || currentObj is Swell) // It's best to unpress any remaining keys before DrumRoll or Swell
+                    currentObj is DrumRoll || currentObj is Swell) // Unpress all keys before DrumRoll or Swell
                     return Beatmap.HitObjects[currentIndex];
             }
 

From 77e9e89fecdcac72fd34e607fe4f909b2b83cbf0 Mon Sep 17 00:00:00 2001
From: Desconocidosmh <Desconocidosmh@users.noreply.github.com>
Date: Mon, 19 Aug 2019 20:45:23 +0200
Subject: [PATCH 13/18] Refactoring

---
 osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs | 8 ++++----
 osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
index b9dd32208e..fd0a876775 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
@@ -81,14 +81,14 @@ namespace osu.Game.Rulesets.Mania.Replays
             for (int i = 0; i < Beatmap.HitObjects.Count; i++)
             {
                 var currentObject = Beatmap.HitObjects[i];
-                var nextObjectInTheSameColumn = GetNextObject(i);
+                var nextObjectInColumn = GetNextObject(i); // Get the next object that requires pressing the same button
 
                 double endTime = (currentObject as IHasEndTime)?.EndTime ?? currentObject.StartTime;
 
-                bool canDelayKeyUp = nextObjectInTheSameColumn == null ||
-                                     nextObjectInTheSameColumn.StartTime > endTime + RELEASE_DELAY;
+                bool canDelayKeyUp = nextObjectInColumn == null ||
+                                     nextObjectInColumn.StartTime > endTime + RELEASE_DELAY;
 
-                double calculatedDelay = canDelayKeyUp ? RELEASE_DELAY : (nextObjectInTheSameColumn.StartTime - endTime) * 0.9;
+                double calculatedDelay = canDelayKeyUp ? RELEASE_DELAY : (nextObjectInColumn.StartTime - endTime) * 0.9;
 
                 yield return new HitPoint { Time = currentObject.StartTime, Column = currentObject.Column };
 
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index 4d6730c0e6..6720d8b8bf 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Rulesets.Taiko.Replays
                 else
                     throw new InvalidOperationException("Unknown hit object type.");
 
-                var nextHitObject = GetNextObject(i);
+                var nextHitObject = GetNextObject(i); // Get the next object that requires pressing the same button
 
                 bool canDelayKeyUp = nextHitObject == null || nextHitObject.StartTime > endTime + KEY_UP_DELAY;
 
@@ -142,7 +142,7 @@ namespace osu.Game.Rulesets.Taiko.Replays
             for (; currentIndex < Beatmap.HitObjects.Count; currentIndex++)
             {
                 var currentObj = Beatmap.HitObjects[currentIndex];
-                if (currentObj.GetType().Equals(desiredType) ||
+                if (currentObj.GetType() == desiredType ||
                     currentObj is DrumRoll || currentObj is Swell) // Unpress all keys before DrumRoll or Swell
                     return Beatmap.HitObjects[currentIndex];
             }

From 289bd8e6b0c9367ae4cb9bbb15a4f3be7c424213 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Aug 2019 14:25:35 +0900
Subject: [PATCH 14/18] Don't return DefaultSkin on beatmap skin parsing
 failure

---
 osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 5657b8fb8a..2d8a0b1249 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -138,19 +138,15 @@ namespace osu.Game.Beatmaps
 
             protected override Skin GetSkin()
             {
-                Skin skin;
-
                 try
                 {
-                    skin = new LegacyBeatmapSkin(BeatmapInfo, store, AudioManager);
+                    return new LegacyBeatmapSkin(BeatmapInfo, store, AudioManager);
                 }
                 catch (Exception e)
                 {
                     Logger.Error(e, "Skin failed to load");
-                    skin = new DefaultSkin();
+                    return null;
                 }
-
-                return skin;
             }
         }
     }

From 6596d7fc463d3a73cbf5605d1074135db9c230f8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Aug 2019 16:33:24 +0900
Subject: [PATCH 15/18] Add nullref safety to FrameStablePlayback boolean

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index eb14bd1f24..ccfd89adca 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -62,13 +62,20 @@ namespace osu.Game.Rulesets.UI
 
         public override GameplayClock FrameStableClock => frameStabilityContainer.GameplayClock;
 
+        private bool frameStablePlayback = true;
+
         /// <summary>
         /// Whether to enable frame-stable playback.
         /// </summary>
         internal bool FrameStablePlayback
         {
-            get => frameStabilityContainer.FrameStablePlayback;
-            set => frameStabilityContainer.FrameStablePlayback = value;
+            get => frameStablePlayback;
+            set
+            {
+                frameStablePlayback = false;
+                if (frameStabilityContainer != null)
+                    frameStabilityContainer.FrameStablePlayback = value;
+            }
         }
 
         /// <summary>
@@ -156,6 +163,7 @@ namespace osu.Game.Rulesets.UI
             {
                 frameStabilityContainer = new FrameStabilityContainer(GameplayStartTime)
                 {
+                    FrameStablePlayback = FrameStablePlayback,
                     Child = KeyBindingInputManager
                         .WithChild(CreatePlayfieldAdjustmentContainer()
                             .WithChild(Playfield)

From 6dfe95db74b6d12d1ed5b9567a0652eb6303d589 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Aug 2019 16:34:12 +0900
Subject: [PATCH 16/18] Allow RulesetConfigCache to return null configs

---
 osu.Game/Rulesets/RulesetConfigCache.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/RulesetConfigCache.cs b/osu.Game/Rulesets/RulesetConfigCache.cs
index 9a5a4d4acd..8c9e3c94e2 100644
--- a/osu.Game/Rulesets/RulesetConfigCache.cs
+++ b/osu.Game/Rulesets/RulesetConfigCache.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets
         public IRulesetConfigManager GetConfigFor(Ruleset ruleset)
         {
             if (ruleset.RulesetInfo.ID == null)
-                throw new InvalidOperationException("The provided ruleset doesn't have a valid id.");
+                return null;
 
             return configCache.GetOrAdd(ruleset.RulesetInfo.ID.Value, _ => ruleset.CreateConfig(settingsStore));
         }

From d4a296f9116fc9ce35695e9f2c89bfebd3cd8041 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Aug 2019 17:45:12 +0900
Subject: [PATCH 17/18] Slight refactoring

---
 .../Replays/ManiaAutoGenerator.cs                  |  8 ++++----
 .../Replays/TaikoAutoGenerator.cs                  | 14 +++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
index fd0a876775..7b8bbc2095 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
@@ -98,12 +98,12 @@ namespace osu.Game.Rulesets.Mania.Replays
 
         protected override HitObject GetNextObject(int currentIndex)
         {
-            int desiredColumn = Beatmap.HitObjects[currentIndex++].Column;
+            int desiredColumn = Beatmap.HitObjects[currentIndex].Column;
 
-            for (; currentIndex < Beatmap.HitObjects.Count; currentIndex++)
+            for (int i = currentIndex + 1; i < Beatmap.HitObjects.Count; i++)
             {
-                if (Beatmap.HitObjects[currentIndex].Column == desiredColumn)
-                    return Beatmap.HitObjects[currentIndex];
+                if (Beatmap.HitObjects[i].Column == desiredColumn)
+                    return Beatmap.HitObjects[i];
             }
 
             return null;
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index 6720d8b8bf..299679b2c1 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -137,14 +137,18 @@ namespace osu.Game.Rulesets.Taiko.Replays
 
         protected override HitObject GetNextObject(int currentIndex)
         {
-            Type desiredType = Beatmap.HitObjects[currentIndex++].GetType();
+            Type desiredType = Beatmap.HitObjects[currentIndex].GetType();
 
-            for (; currentIndex < Beatmap.HitObjects.Count; currentIndex++)
+            for (int i = currentIndex + 1; i < Beatmap.HitObjects.Count; i++)
             {
-                var currentObj = Beatmap.HitObjects[currentIndex];
+                var currentObj = Beatmap.HitObjects[i];
+
                 if (currentObj.GetType() == desiredType ||
-                    currentObj is DrumRoll || currentObj is Swell) // Unpress all keys before DrumRoll or Swell
-                    return Beatmap.HitObjects[currentIndex];
+                    // Un-press all keys before a DrumRoll or Swell
+                    currentObj is DrumRoll || currentObj is Swell)
+                {
+                    return Beatmap.HitObjects[i];
+                }
             }
 
             return null;

From 62641c149d96d33ec56542764b3d2a8ddd7258cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Aug 2019 18:18:14 +0900
Subject: [PATCH 18/18] Fx component lookups being incorrect for non-databased
 legacy skins

---
 .../metrics-skin/approachcircle@2x.png          | Bin 0 -> 13816 bytes
 osu.Game/Skinning/LegacySkin.cs                 |  10 ++++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/approachcircle@2x.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/approachcircle@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/approachcircle@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..72ef665478b758c364197aa79f238230e229b3c4
GIT binary patch
literal 13816
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
X;|*6ltxe$d|7PiG>1$T1+eQB$HM;D+

literal 0
HcmV?d00001

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 48310cf027..7bffe5d321 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -155,6 +155,11 @@ namespace osu.Game.Skinning
                             // Spacing value was reverse-engineered from the ratio of the rendered sprite size in the visual inspector vs the actual texture size
                             Spacing = new Vector2(-Configuration.HitCircleOverlap * 0.89f, 0)
                         };
+
+                default:
+                    string lastPiece = componentName.Split('/').Last();
+                    componentName = componentName.StartsWith("Gameplay/taiko/") ? "taiko-" + lastPiece : lastPiece;
+                    break;
             }
 
             return getAnimation(componentName, animatable, looping);
@@ -226,11 +231,8 @@ namespace osu.Game.Skinning
             {
                 bool hasExtension = filename.Contains('.');
 
-                string lastPiece = filename.Split('/').Last();
-                var legacyName = filename.StartsWith("Gameplay/taiko/") ? "taiko-" + lastPiece : lastPiece;
-
                 var file = source.Files.Find(f =>
-                    string.Equals(hasExtension ? f.Filename : Path.ChangeExtension(f.Filename, null), legacyName, StringComparison.InvariantCultureIgnoreCase));
+                    string.Equals(hasExtension ? f.Filename : Path.ChangeExtension(f.Filename, null), filename, StringComparison.InvariantCultureIgnoreCase));
                 return file?.FileInfo.StoragePath;
             }