From 5874475dffbc5ba6d1bf620d07e026360858a3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 24 Jan 2022 20:46:54 +0100
Subject: [PATCH] Extract `DefaultFlashlightSize` to base flashlight class

---
 osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs | 2 +-
 osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs     | 2 +-
 osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs | 2 +-
 osu.Game/Rulesets/Mods/ModFlashlight.cs            | 6 ++++++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
index e7335dcc34..4c5dcf84d2 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.Mods
             Value = true
         };
 
-        protected virtual float DefaultFlashlightSize => 350;
+        public override float DefaultFlashlightSize => 350;
 
         public override Flashlight CreateFlashlight() => new CatchFlashlight(playfield, ComboBasedSize.Value, SizeMultiplier.Value, DefaultFlashlightSize);
 
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs
index f89c131fea..03be00c5db 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Mania.Mods
             Value = false
         };
 
-        protected virtual float DefaultFlashlightSize => 50;
+        public override float DefaultFlashlightSize => 50;
 
         public override Flashlight CreateFlashlight() => new ManiaFlashlight(ComboBasedSize.Value, SizeMultiplier.Value, DefaultFlashlightSize);
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
index bc915591d0..f344bb017e 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             Value = true
         };
 
-        protected virtual float DefaultFlashlightSize => 180;
+        public override float DefaultFlashlightSize => 180;
 
         private OsuFlashlight flashlight;
 
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
index 48e56c8784..576fbb65a0 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
             Value = true
         };
 
-        protected virtual float DefaultFlashlightSize => 250;
+        public override float DefaultFlashlightSize => 250;
 
         public override Flashlight CreateFlashlight() => new TaikoFlashlight(playfield, ComboBasedSize.Value, SizeMultiplier.Value, DefaultFlashlightSize);
 
diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index d3998bcad4..f2fd86d549 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -38,6 +38,12 @@ namespace osu.Game.Rulesets.Mods
 
         [SettingSource("Change size based on combo", "Decrease the flashlight size as combo increases.")]
         public abstract BindableBool ComboBasedSize { get; }
+
+        /// <summary>
+        /// The default size of the flashlight in ruleset-appropriate dimensions.
+        /// <see cref="SizeMultiplier"/> and <see cref="ComboBasedSize"/> will apply their adjustments on top of this size.
+        /// </summary>
+        public abstract float DefaultFlashlightSize { get; }
     }
 
     public abstract class ModFlashlight<T> : ModFlashlight, IApplicableToDrawableRuleset<T>, IApplicableToScoreProcessor