From 5af1ac1b537bfce3b993692dbdff1e01a4de7278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 21:46:02 +0100
Subject: [PATCH] Rename TaikoStrong{-> able}HitObject

---
 osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs | 2 +-
 osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs   | 2 +-
 osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs       | 2 +-
 .../Objects/Drawables/DrawableTaikoStrongHitObject.cs       | 6 +++---
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs                 | 2 +-
 osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs             | 2 +-
 osu.Game.Rulesets.Taiko/Objects/Hit.cs                      | 2 +-
 osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs    | 2 +-
 ...{TaikoStrongHitObject.cs => TaikoStrongableHitObject.cs} | 2 +-
 .../Skinning/Legacy/LegacyCirclePiece.cs                    | 2 +-
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs                  | 2 +-
 osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs                | 6 +++---
 12 files changed, 16 insertions(+), 16 deletions(-)
 rename osu.Game.Rulesets.Taiko/Objects/{TaikoStrongHitObject.cs => TaikoStrongableHitObject.cs} (96%)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
index 126af1a6ad..3d77fb05db 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 IsCentre = (hitObject as Hit)?.Type == HitType.Centre,
                 IsDrumRoll = hitObject is DrumRoll,
                 IsSwell = hitObject is Swell,
-                IsStrong = (hitObject as TaikoStrongHitObject)?.IsStrong == true
+                IsStrong = (hitObject as TaikoStrongableHitObject)?.IsStrong == true
             };
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 78a0d1fdff..1214c594aa 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                 converted.HitObjects = converted.HitObjects.GroupBy(t => t.StartTime).Select(x =>
                 {
                     TaikoHitObject first = x.First();
-                    if (x.Skip(1).Any() && first is TaikoStrongHitObject strong)
+                    if (x.Skip(1).Any() && first is TaikoStrongableHitObject strong)
                         strong.IsStrong = true;
                     return first;
                 }).ToList();
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index 7de920ca8c..3fbcee44af 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
             base.UpdateTernaryStates();
 
             selectionRimState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<Hit>(), h => h.Type == HitType.Rim);
-            selectionStrongState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<TaikoStrongHitObject>(), h => h.IsStrong);
+            selectionStrongState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<TaikoStrongableHitObject>(), h => h.IsStrong);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
index 04e584e15d..614c12165e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
@@ -13,7 +13,7 @@ using osuTK;
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
     public abstract class DrawableTaikoStrongHitObject<TObject, TStrongNestedObject> : DrawableTaikoHitObject<TObject>
-        where TObject : TaikoStrongHitObject
+        where TObject : TaikoStrongableHitObject
         where TStrongNestedObject : StrongNestedHitObject
     {
         private readonly Bindable<bool> isStrong;
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             base.RecreatePieces();
             if (HitObject.IsStrong)
-                Size = BaseSize = new Vector2(TaikoStrongHitObject.DEFAULT_STRONG_SIZE);
+                Size = BaseSize = new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE);
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         /// <summary>
         /// Creates the handler for this <see cref="DrawableHitObject"/>'s <see cref="StrongNestedHitObject"/>.
-        /// This is only invoked if <see cref="TaikoStrongHitObject.IsStrong"/> is true for <see cref="HitObject"/>.
+        /// This is only invoked if <see cref="TaikoStrongableHitObject.IsStrong"/> is true for <see cref="HitObject"/>.
         /// </summary>
         /// <param name="hitObject">The strong hitobject.</param>
         /// <returns>The strong hitobject handler.</returns>
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 93f95d6446..c0377c67a5 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRoll : TaikoStrongHitObject, IHasPath
+    public class DrumRoll : TaikoStrongableHitObject, IHasPath
     {
         /// <summary>
         /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
index 6b6ffa8668..9d0336441e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRollTick : TaikoStrongHitObject
+    public class DrumRollTick : TaikoStrongableHitObject
     {
         /// <summary>
         /// Whether this is the first (initial) tick of the slider.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index 6bdde376f6..1b51288605 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -5,7 +5,7 @@ using osu.Framework.Bindables;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class Hit : TaikoStrongHitObject
+    public class Hit : TaikoStrongableHitObject
     {
         public readonly Bindable<HitType> TypeBindable = new Bindable<HitType>();
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
index 2e8989bc79..3b427e48c5 100644
--- a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
 {
     /// <summary>
     /// Base type for nested strong hits.
-    /// Used by <see cref="TaikoStrongHitObject"/>s to represent their strong bonus scoring portions.
+    /// Used by <see cref="TaikoStrongableHitObject"/>s to represent their strong bonus scoring portions.
     /// </summary>
     public abstract class StrongNestedHitObject : TaikoHitObject
     {
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
similarity index 96%
rename from osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
rename to osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
index 861de95bae..fcd055bcec 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
     /// <summary>
     /// Base class for taiko hitobjects that can become strong (large).
     /// </summary>
-    public abstract class TaikoStrongHitObject : TaikoHitObject
+    public abstract class TaikoStrongableHitObject : TaikoHitObject
     {
         /// <summary>
         /// Scale multiplier for a strong drawable taiko hit object.
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
index 52c9080633..2b6c14ca63 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                 const string normal_hit = "taikohit";
                 const string big_hit = "taikobig";
 
-                string prefix = ((drawableHitObject.HitObject as TaikoStrongHitObject)?.IsStrong ?? false) ? big_hit : normal_hit;
+                string prefix = ((drawableHitObject.HitObject as TaikoStrongableHitObject)?.IsStrong ?? false) ? big_hit : normal_hit;
 
                 return skin.GetAnimation($"{prefix}{lookup}", true, false) ??
                        // fallback to regular size if "big" version doesn't exist.
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index 05408e1049..d1fb3348b9 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         /// </summary>
         public void VisualiseSecondHit()
         {
-            this.ResizeTo(new Vector2(TaikoStrongHitObject.DEFAULT_STRONG_SIZE), 50);
+            this.ResizeTo(new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE), 50);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs b/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
index 5d8145391d..6401c6d09f 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     RelativeSizeAxes = Axes.Y,
-                    Size = new Vector2(border_thickness, (1 - TaikoStrongHitObject.DEFAULT_STRONG_SIZE) / 2f),
+                    Size = new Vector2(border_thickness, (1 - TaikoStrongableHitObject.DEFAULT_STRONG_SIZE) / 2f),
                     Alpha = 0.1f
                 },
                 new CircularContainer
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(TaikoStrongHitObject.DEFAULT_STRONG_SIZE),
+                    Size = new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE),
                     Masking = true,
                     BorderColour = Color4.White,
                     BorderThickness = border_thickness,
@@ -83,7 +83,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
                     RelativeSizeAxes = Axes.Y,
-                    Size = new Vector2(border_thickness, (1 - TaikoStrongHitObject.DEFAULT_STRONG_SIZE) / 2f),
+                    Size = new Vector2(border_thickness, (1 - TaikoStrongableHitObject.DEFAULT_STRONG_SIZE) / 2f),
                     Alpha = 0.1f
                 },
             };