From 8cbc0502aea885ce2468ccfda0b457297382ead9 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Mon, 12 Sep 2022 15:51:18 +0300
Subject: [PATCH] Inline `CalculateEffect`
---
osu.Game/Overlays/Mods/ModsEffectDisplay.cs | 27 ++++-----------------
1 file changed, 5 insertions(+), 22 deletions(-)
diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
index 3b112fdbd3..eed3181e49 100644
--- a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
@@ -49,22 +49,9 @@ namespace osu.Game.Overlays.Mods
///
protected abstract LocalisableString Label { get; }
- ///
- /// Calculates, does current value increase difficulty or decrease it.
- ///
- /// Value to calculate for. Will arrive from bindable once it changes.
- /// Effect of the value.
- ///
- /// Default implementation compares the value with ., bigger value counts as difficulty increase.
- ///
- protected virtual ModEffect CalculateEffect(double value)
- {
- return CalculateForSign(value.CompareTo(Current.Default));
- }
-
protected virtual float ValueAreaWidth => 56;
- protected virtual string CounterFormat => "N0";
+ protected virtual string CounterFormat => @"N0";
protected override Container Content => content;
@@ -159,7 +146,7 @@ namespace osu.Game.Overlays.Mods
{
Current.BindValueChanged(e =>
{
- var effect = CalculateEffect(e.NewValue);
+ var effect = CalculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
setColours(effect);
}, true);
}
@@ -192,14 +179,12 @@ namespace osu.Game.Overlays.Mods
}
}
- #region Quick implementations for CalculateEffect
-
///
/// Converts signed integer into . Negative values are counted as difficulty reduction, positive as increase.
///
- /// Value to convert. Can be obtained from CompareTo.
- /// Effect.
- protected ModEffect CalculateForSign(int comparison)
+ /// Value to convert. Will arrive from comparison between bindable once it changes and it's .
+ /// Effect of the value.
+ protected virtual ModEffect CalculateEffectForComparison(int comparison)
{
if (comparison == 0)
return ModEffect.NotChanged;
@@ -209,8 +194,6 @@ namespace osu.Game.Overlays.Mods
return ModEffect.DifficultyIncrease;
}
- #endregion
-
protected enum ModEffect
{
NotChanged,