From fa3c919e2e986ee8ca74e21df052d136dfa25c40 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 3 Aug 2018 16:11:38 +0900
Subject: [PATCH] Fix up taiko judgement creation

---
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs       | 11 -----------
 osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs   |  9 +--------
 osu.Game.Rulesets.Taiko/Objects/Hit.cs            | 11 -----------
 osu.Game.Rulesets.Taiko/Objects/Swell.cs          | 11 -----------
 osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs |  4 ++++
 5 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 2ed59d3c43..4c9ec5473b 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -3,11 +3,8 @@
 
 using osu.Game.Rulesets.Objects.Types;
 using System;
-using System.Collections.Generic;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
@@ -84,13 +81,5 @@ namespace osu.Game.Rulesets.Taiko.Objects
                 first = false;
             }
         }
-
-        protected override IEnumerable<Judgement> CreateJudgements()
-        {
-            yield return new TaikoJudgement();
-
-            if (IsStrong)
-                yield return new TaikoStrongHitJudgement();
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
index 7e36a896c1..f6a3a5efef 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Taiko.Judgements;
 
@@ -25,12 +24,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
         /// </summary>
         public double HitWindow => TickSpacing / 2;
 
-        protected override IEnumerable<Judgement> CreateJudgements()
-        {
-            yield return new TaikoDrumRollTickJudgement();
-
-            if (IsStrong)
-                yield return new TaikoStrongHitJudgement();
-        }
+        protected override Judgement CreateJudgement() => new TaikoDrumRollTickJudgement();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index 6795aef730..0b47aa490b 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -1,20 +1,9 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
-using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Taiko.Judgements;
-
 namespace osu.Game.Rulesets.Taiko.Objects
 {
     public class Hit : TaikoHitObject
     {
-        protected override IEnumerable<Judgement> CreateJudgements()
-        {
-            yield return new TaikoJudgement();
-
-            if (IsStrong)
-                yield return new TaikoStrongHitJudgement();
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Swell.cs b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
index fef7f4b889..eb6f931af4 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Swell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
@@ -1,10 +1,7 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
@@ -18,13 +15,5 @@ namespace osu.Game.Rulesets.Taiko.Objects
         /// The number of hits required to complete the swell successfully.
         /// </summary>
         public int RequiredHits = 10;
-
-        protected override IEnumerable<Judgement> CreateJudgements()
-        {
-            for (int i = 0; i < RequiredHits; i++)
-                yield return new TaikoIntermediateSwellJudgement();
-
-            yield return new TaikoJudgement();
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
index ffbbe28f2e..f3dfb333b3 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
@@ -1,7 +1,9 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
@@ -28,6 +30,8 @@ namespace osu.Game.Rulesets.Taiko.Objects
         /// </summary>
         public bool IsStrong;
 
+        protected override Judgement CreateJudgement() => new TaikoJudgement();
+
         protected override HitWindows CreateHitWindows() => new TaikoHitWindows();
     }
 }