From 161a2a321ef5ecc93dfeb9d5a99af66f7881be2a Mon Sep 17 00:00:00 2001
From: mk-56 <darioheadleysilva@gmail.com>
Date: Mon, 24 Jan 2022 09:07:07 +0100
Subject: [PATCH] Remove bindable from ModeMultiplier

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

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
index e8f1ebdd10..4fbbf63abf 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
@@ -33,13 +33,9 @@ namespace osu.Game.Rulesets.Catch.Mods
             Precision = 0.1f
         };
 
-        protected override BindableNumber<float> ModeMultiplier { get; } = new BindableNumber<float>
-        {
-            Default = 350,
-            Value = 350,
-        };
+        protected override float ModeMultiplier => 350;
 
-        public override Flashlight CreateFlashlight() => new CatchFlashlight(playfield, ChangeRadius.Value, InitialRadius.Value, ModeMultiplier.Value);
+        public override Flashlight CreateFlashlight() => new CatchFlashlight(playfield, ChangeRadius.Value, InitialRadius.Value, ModeMultiplier);
 
         private CatchPlayfield playfield;
 
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs
index 9ca1a72584..61f73a1ee5 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs
@@ -34,13 +34,9 @@ namespace osu.Game.Rulesets.Mania.Mods
             Precision = 0.1f
         };
 
-        protected override BindableNumber<float> ModeMultiplier { get; } = new BindableNumber<float>
-        {
-            Default = 50,
-            Value = 50,
-        };
+        protected override float ModeMultiplier => 50;
 
-        public override Flashlight CreateFlashlight() => new ManiaFlashlight(ChangeRadius.Value, InitialRadius.Value, ModeMultiplier.Value);
+        public override Flashlight CreateFlashlight() => new ManiaFlashlight(ChangeRadius.Value, InitialRadius.Value, ModeMultiplier);
 
         private class ManiaFlashlight : Flashlight
         {
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
index c6cf5ce4b5..75299863a9 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
@@ -47,15 +47,11 @@ namespace osu.Game.Rulesets.Osu.Mods
             Precision = 0.1f
         };
 
-        protected override BindableNumber<float> ModeMultiplier { get; } = new BindableNumber<float>
-        {
-            Default = 180,
-            Value = 180,
-        };
+        protected override float ModeMultiplier => 180;
 
         private OsuFlashlight flashlight;
 
-        public override Flashlight CreateFlashlight() => flashlight = new OsuFlashlight(ChangeRadius.Value, InitialRadius.Value, FollowDelay.Value, ModeMultiplier.Value);
+        public override Flashlight CreateFlashlight() => flashlight = new OsuFlashlight(ChangeRadius.Value, InitialRadius.Value, FollowDelay.Value, ModeMultiplier);
 
         public void ApplyToDrawableHitObject(DrawableHitObject drawable)
         {
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
index f235698b55..65a173b491 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
@@ -34,13 +34,9 @@ namespace osu.Game.Rulesets.Taiko.Mods
             Precision = 0.1f
         };
 
-        protected override BindableNumber<float> ModeMultiplier { get; } = new BindableNumber<float>
-        {
-            Default = 250,
-            Value = 250,
-        };
+        protected override float ModeMultiplier => 250;
 
-        public override Flashlight CreateFlashlight() => new TaikoFlashlight(playfield, ChangeRadius.Value, InitialRadius.Value, ModeMultiplier.Value);
+        public override Flashlight CreateFlashlight() => new TaikoFlashlight(playfield, ChangeRadius.Value, InitialRadius.Value, ModeMultiplier);
 
         private TaikoPlayfield playfield;
 
diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index d16f310582..7b980e8097 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Initial radius", "Initial radius of the flashlight area.")]
         public abstract BindableNumber<float> InitialRadius { get; }
 
-        protected abstract BindableNumber<float> ModeMultiplier { get; }
+        protected abstract float ModeMultiplier { get; }
     }
 
     public abstract class ModFlashlight<T> : ModFlashlight, IApplicableToDrawableRuleset<T>, IApplicableToScoreProcessor