From 8479880d44c74c8a478151db63facb2d32fbde73 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Fri, 17 Mar 2017 13:33:39 +0900
Subject: [PATCH 1/6] Move SliderVelocityAt into TimingInfo, fix xmldoc.

---
 osu.Game/Beatmaps/Beatmap.cs           | 15 ---------------
 osu.Game/Beatmaps/Timing/TimingInfo.cs | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index fc8bb751f9..f80973a33c 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -43,21 +43,6 @@ namespace osu.Game.Beatmaps
             TimingInfo = original?.TimingInfo ?? TimingInfo;
             ComboColors = original?.ComboColors ?? ComboColors;
         }
-
-        /// <summary>
-        /// Finds the slider velocity at a time.
-        /// </summary>
-        /// <param name="time">The time to find the slider velocity at.</param>
-        /// <returns>The slider velocity in positional length units.</returns>
-        public double SliderVelocityAt(double time)
-        {
-            double scoringDistance = 100 * BeatmapInfo.Difficulty.SliderMultiplier;
-            double beatDistance = TimingInfo.BeatDistanceAt(time);
-
-            if (beatDistance > 0)
-                return scoringDistance / beatDistance * 1000;
-            return scoringDistance;
-        }
     }
 
     /// <summary>
diff --git a/osu.Game/Beatmaps/Timing/TimingInfo.cs b/osu.Game/Beatmaps/Timing/TimingInfo.cs
index f245a6b1aa..0e47ba983b 100644
--- a/osu.Game/Beatmaps/Timing/TimingInfo.cs
+++ b/osu.Game/Beatmaps/Timing/TimingInfo.cs
@@ -102,5 +102,21 @@ namespace osu.Game.Beatmaps.Timing
 
             return timingPoint ?? ControlPoint.Default;
         }
+
+        /// <summary>
+        /// Finds the slider velocity at a time.
+        /// </summary>
+        /// <param name="time">The time to find the slider velocity at.</param>
+        /// <returns>The slider velocity in milliseconds.</returns>
+        public double SliderVelocityAt(double time)
+        {
+            const double base_scoring_distance = 100;
+
+            double beatDistance = BeatDistanceAt(time);
+
+            if (beatDistance > 0)
+                return base_scoring_distance / beatDistance * 1000;
+            return base_scoring_distance;
+        }
     }
 }
\ No newline at end of file

From 28240fb3b5f30ac5139a63f8b0e06a88b501a0ff Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Fri, 17 Mar 2017 13:33:48 +0900
Subject: [PATCH 2/6] Rename TaikoBaseHit -> TaikoHitObject.

---
 osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs |  8 ++++----
 osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapProcessor.cs |  6 +++---
 .../Objects/Drawable/DrawableTaikoHit.cs               |  4 ++--
 .../Objects/{TaikoBaseHit.cs => TaikoHitObject.cs}     |  2 +-
 osu.Game.Modes.Taiko/TaikoDifficultyCalculator.cs      |  4 ++--
 osu.Game.Modes.Taiko/TaikoScoreProcessor.cs            |  4 ++--
 osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs            | 10 +++++-----
 osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs              |  2 +-
 osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj       |  2 +-
 9 files changed, 21 insertions(+), 21 deletions(-)
 rename osu.Game.Modes.Taiko/Objects/{TaikoBaseHit.cs => TaikoHitObject.cs} (85%)

diff --git a/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 3230010fda..d78c347f22 100644
--- a/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -7,13 +7,13 @@ using System.Collections.Generic;
 
 namespace osu.Game.Modes.Taiko.Beatmaps
 {
-    internal class TaikoBeatmapConverter : IBeatmapConverter<TaikoBaseHit>
+    internal class TaikoBeatmapConverter : IBeatmapConverter<TaikoHitObject>
     {
-        public Beatmap<TaikoBaseHit> Convert(Beatmap original)
+        public Beatmap<TaikoHitObject> Convert(Beatmap original)
         {
-            return new Beatmap<TaikoBaseHit>(original)
+            return new Beatmap<TaikoHitObject>(original)
             {
-                HitObjects = new List<TaikoBaseHit>() // Todo: Implement
+                HitObjects = new List<TaikoHitObject>() // Todo: Implement
             };
         }
     }
diff --git a/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapProcessor.cs b/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapProcessor.cs
index 9a244cd23e..84bc470e55 100644
--- a/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapProcessor.cs
+++ b/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapProcessor.cs
@@ -6,13 +6,13 @@ using osu.Game.Modes.Taiko.Objects;
 
 namespace osu.Game.Modes.Taiko.Beatmaps
 {
-    internal class TaikoBeatmapProcessor : IBeatmapProcessor<TaikoBaseHit>
+    internal class TaikoBeatmapProcessor : IBeatmapProcessor<TaikoHitObject>
     {
-        public void SetDefaults(TaikoBaseHit hitObject, Beatmap<TaikoBaseHit> beatmap)
+        public void SetDefaults(TaikoHitObject hitObject, Beatmap<TaikoHitObject> beatmap)
         {
         }
 
-        public void PostProcess(Beatmap<TaikoBaseHit> beatmap)
+        public void PostProcess(Beatmap<TaikoHitObject> beatmap)
         {
         }
     }
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs
index a54108afda..760977ef5b 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs
@@ -12,9 +12,9 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
 {
     internal class DrawableTaikoHit : Sprite
     {
-        private TaikoBaseHit h;
+        private TaikoHitObject h;
 
-        public DrawableTaikoHit(TaikoBaseHit h)
+        public DrawableTaikoHit(TaikoHitObject h)
         {
             this.h = h;
 
diff --git a/osu.Game.Modes.Taiko/Objects/TaikoBaseHit.cs b/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs
similarity index 85%
rename from osu.Game.Modes.Taiko/Objects/TaikoBaseHit.cs
rename to osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs
index 4077c1933a..a5f488e076 100644
--- a/osu.Game.Modes.Taiko/Objects/TaikoBaseHit.cs
+++ b/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs
@@ -5,7 +5,7 @@ using osu.Game.Modes.Objects;
 
 namespace osu.Game.Modes.Taiko.Objects
 {
-    public class TaikoBaseHit : HitObject
+    public class TaikoHitObject : HitObject
     {
         public float Scale = 1;
 
diff --git a/osu.Game.Modes.Taiko/TaikoDifficultyCalculator.cs b/osu.Game.Modes.Taiko/TaikoDifficultyCalculator.cs
index 4a133ea896..93dfc3d651 100644
--- a/osu.Game.Modes.Taiko/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Modes.Taiko/TaikoDifficultyCalculator.cs
@@ -8,7 +8,7 @@ using System.Collections.Generic;
 
 namespace osu.Game.Modes.Taiko
 {
-    public class TaikoDifficultyCalculator : DifficultyCalculator<TaikoBaseHit>
+    public class TaikoDifficultyCalculator : DifficultyCalculator<TaikoHitObject>
     {
         public TaikoDifficultyCalculator(Beatmap beatmap) : base(beatmap)
         {
@@ -19,6 +19,6 @@ namespace osu.Game.Modes.Taiko
             return 0;
         }
 
-        protected override IBeatmapConverter<TaikoBaseHit> CreateBeatmapConverter() => new TaikoBeatmapConverter();
+        protected override IBeatmapConverter<TaikoHitObject> CreateBeatmapConverter() => new TaikoBeatmapConverter();
     }
 }
\ No newline at end of file
diff --git a/osu.Game.Modes.Taiko/TaikoScoreProcessor.cs b/osu.Game.Modes.Taiko/TaikoScoreProcessor.cs
index 1e5c70cd2e..849c0fa894 100644
--- a/osu.Game.Modes.Taiko/TaikoScoreProcessor.cs
+++ b/osu.Game.Modes.Taiko/TaikoScoreProcessor.cs
@@ -7,13 +7,13 @@ using osu.Game.Modes.UI;
 
 namespace osu.Game.Modes.Taiko
 {
-    internal class TaikoScoreProcessor : ScoreProcessor<TaikoBaseHit, TaikoJudgementInfo>
+    internal class TaikoScoreProcessor : ScoreProcessor<TaikoHitObject, TaikoJudgementInfo>
     {
         public TaikoScoreProcessor()
         {
         }
 
-        public TaikoScoreProcessor(HitRenderer<TaikoBaseHit, TaikoJudgementInfo> hitRenderer)
+        public TaikoScoreProcessor(HitRenderer<TaikoHitObject, TaikoJudgementInfo> hitRenderer)
             : base(hitRenderer)
         {
         }
diff --git a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
index 385b0915f4..80e42cb976 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
@@ -10,7 +10,7 @@ using osu.Game.Modes.UI;
 
 namespace osu.Game.Modes.Taiko.UI
 {
-    public class TaikoHitRenderer : HitRenderer<TaikoBaseHit, TaikoJudgementInfo>
+    public class TaikoHitRenderer : HitRenderer<TaikoHitObject, TaikoJudgementInfo>
     {
         public TaikoHitRenderer(WorkingBeatmap beatmap)
             : base(beatmap)
@@ -19,12 +19,12 @@ namespace osu.Game.Modes.Taiko.UI
 
         public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor(this);
 
-        protected override IBeatmapConverter<TaikoBaseHit> CreateBeatmapConverter() => new TaikoBeatmapConverter();
+        protected override IBeatmapConverter<TaikoHitObject> CreateBeatmapConverter() => new TaikoBeatmapConverter();
 
-        protected override IBeatmapProcessor<TaikoBaseHit> CreateBeatmapProcessor() => new TaikoBeatmapProcessor();
+        protected override IBeatmapProcessor<TaikoHitObject> CreateBeatmapProcessor() => new TaikoBeatmapProcessor();
 
-        protected override Playfield<TaikoBaseHit, TaikoJudgementInfo> CreatePlayfield() => new TaikoPlayfield();
+        protected override Playfield<TaikoHitObject, TaikoJudgementInfo> CreatePlayfield() => new TaikoPlayfield();
 
-        protected override DrawableHitObject<TaikoBaseHit, TaikoJudgementInfo> GetVisualRepresentation(TaikoBaseHit h) => null;
+        protected override DrawableHitObject<TaikoHitObject, TaikoJudgementInfo> GetVisualRepresentation(TaikoHitObject h) => null;
     }
 }
diff --git a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
index d80aa94fa1..f3ae600501 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
@@ -13,7 +13,7 @@ using osu.Game.Modes.Taiko.Judgements;
 
 namespace osu.Game.Modes.Taiko.UI
 {
-    public class TaikoPlayfield : Playfield<TaikoBaseHit, TaikoJudgementInfo>
+    public class TaikoPlayfield : Playfield<TaikoHitObject, TaikoJudgementInfo>
     {
         public TaikoPlayfield()
         {
diff --git a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
index bc38781b01..7ea6dfeadb 100644
--- a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
+++ b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
@@ -52,7 +52,7 @@
     <Compile Include="Judgements\TaikoJudgementInfo.cs" />
     <Compile Include="TaikoDifficultyCalculator.cs" />
     <Compile Include="Objects\Drawable\DrawableTaikoHit.cs" />
-    <Compile Include="Objects\TaikoBaseHit.cs" />
+    <Compile Include="Objects\TaikoHitObject.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TaikoScoreProcessor.cs" />
     <Compile Include="UI\TaikoHitRenderer.cs" />

From b399c6adbb65dcf7a4a6442c2de5e49be8b9d18c Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Fri, 17 Mar 2017 13:38:17 +0900
Subject: [PATCH 3/6] Implement TaikoHitObject.

---
 .../Objects/TaikoHitObject.cs                 | 73 +++++++++++++++++--
 osu.Game.Modes.Taiko/Objects/TaikoHitType.cs  | 21 ++++++
 .../osu.Game.Modes.Taiko.csproj               |  1 +
 3 files changed, 87 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game.Modes.Taiko/Objects/TaikoHitType.cs

diff --git a/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs b/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs
index a5f488e076..b46a633647 100644
--- a/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs
+++ b/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs
@@ -1,20 +1,77 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Game.Beatmaps.Samples;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Database;
 using osu.Game.Modes.Objects;
 
 namespace osu.Game.Modes.Taiko.Objects
 {
     public class TaikoHitObject : HitObject
     {
-        public float Scale = 1;
+        /// <summary>
+        /// HitCircle radius.
+        /// </summary>
+        public const float CIRCLE_RADIUS = 64;
 
-        public TaikoColour Type;
-    }
+        /// <summary>
+        /// The hit window that results in a "GREAT" hit.
+        /// </summary>
+        public double HitWindowGreat = 35;
 
-    public enum TaikoColour
-    {
-        Red,
-        Blue
+        /// <summary>
+        /// The hit window that results in a "GOOD" hit.
+        /// </summary>
+        public double HitWindowGood = 80;
+
+        /// <summary>
+        /// The hit window that results in a "MISS".
+        /// </summary>
+        public double HitWindowMiss = 95;
+
+        /// <summary>
+        /// The time to scroll in the HitObject.
+        /// </summary>
+        public double PreEmpt;
+
+        /// <summary>
+        /// Whether this HitObject is in Kiai time.
+        /// </summary>
+        public bool Kiai;
+
+        /// <summary>
+        /// The type of HitObject.
+        /// </summary>
+        public virtual TaikoHitType Type
+        {
+            get
+            {
+                SampleType st = Sample?.Type ?? SampleType.None;
+
+                return
+                    // Centre/Rim
+                    ((st & ~(SampleType.Finish | SampleType.Normal)) == 0 ? TaikoHitType.CentreHit : TaikoHitType.RimHit)
+                    // Finisher
+                    | ((st & SampleType.Finish) > 0 ? TaikoHitType.Finisher : TaikoHitType.None);
+            }
+        }
+
+        public override void ApplyDefaults(TimingInfo timing, BeatmapDifficulty difficulty)
+        {
+            base.ApplyDefaults(timing, difficulty);
+
+            PreEmpt = 600 / (timing.SliderVelocityAt(StartTime) * difficulty.SliderMultiplier) * 1000;
+
+            ControlPoint overridePoint;
+            Kiai = timing.TimingPointAt(StartTime, out overridePoint).KiaiMode;
+
+            if (overridePoint != null)
+                Kiai |= overridePoint.KiaiMode;
+
+            HitWindowGreat = BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 50, 35, 20);
+            HitWindowGood = BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 120, 80, 50);
+            HitWindowMiss = BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 135, 95, 70);
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/osu.Game.Modes.Taiko/Objects/TaikoHitType.cs b/osu.Game.Modes.Taiko/Objects/TaikoHitType.cs
new file mode 100644
index 0000000000..adf3a67246
--- /dev/null
+++ b/osu.Game.Modes.Taiko/Objects/TaikoHitType.cs
@@ -0,0 +1,21 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+
+namespace osu.Game.Modes.Taiko.Objects
+{
+    [Flags]
+    public enum TaikoHitType
+    {
+        None = 0,
+        CentreHit = 1 << 0,
+        RimHit = 1 << 1,
+        DrumRoll = 1 << 2,
+        DrumRollTick = 1 << 3,
+        Bash = 1 << 4,
+        Finisher = 1 << 5,
+
+        Hit = CentreHit | RimHit
+    }
+}
\ No newline at end of file
diff --git a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
index 7ea6dfeadb..0e9e6a56b4 100644
--- a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
+++ b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
@@ -50,6 +50,7 @@
     <Compile Include="Beatmaps\TaikoBeatmapConverter.cs" />
     <Compile Include="Beatmaps\TaikoBeatmapProcessor.cs" />
     <Compile Include="Judgements\TaikoJudgementInfo.cs" />
+    <Compile Include="Objects\TaikoHitType.cs" />
     <Compile Include="TaikoDifficultyCalculator.cs" />
     <Compile Include="Objects\Drawable\DrawableTaikoHit.cs" />
     <Compile Include="Objects\TaikoHitObject.cs" />

From 33d70b9bbcc1706cd3e2dae7533f374424d9c792 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Mar 2017 13:23:58 +0900
Subject: [PATCH 4/6] Update framework.

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index db310bfc10..169cb6485e 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit db310bfc10cd1c9ed12c9e19cdc0edfa53117353
+Subproject commit 169cb6485e7ae740a71cbcb7d0d9d08052eb8848

From 4b3308fd1db21a5a4aad7f68258e00bd4ff8a641 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Sat, 18 Mar 2017 18:40:26 +0900
Subject: [PATCH 5/6] Remove TaikoHitObject Type, we won't be using this going
 forward.

---
 osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs b/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs
index b46a633647..4c55839ef0 100644
--- a/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs
+++ b/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs
@@ -40,23 +40,6 @@ namespace osu.Game.Modes.Taiko.Objects
         /// </summary>
         public bool Kiai;
 
-        /// <summary>
-        /// The type of HitObject.
-        /// </summary>
-        public virtual TaikoHitType Type
-        {
-            get
-            {
-                SampleType st = Sample?.Type ?? SampleType.None;
-
-                return
-                    // Centre/Rim
-                    ((st & ~(SampleType.Finish | SampleType.Normal)) == 0 ? TaikoHitType.CentreHit : TaikoHitType.RimHit)
-                    // Finisher
-                    | ((st & SampleType.Finish) > 0 ? TaikoHitType.Finisher : TaikoHitType.None);
-            }
-        }
-
         public override void ApplyDefaults(TimingInfo timing, BeatmapDifficulty difficulty)
         {
             base.ApplyDefaults(timing, difficulty);

From 73ffbf81423970358f210231bbd7e3ad66f92163 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Mar 2017 11:52:16 +0900
Subject: [PATCH 6/6] Remove unnecessary using.

---
 osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs b/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs
index 4c55839ef0..61d8ed5f01 100644
--- a/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs
+++ b/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs
@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.Beatmaps.Samples;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Database;
 using osu.Game.Modes.Objects;