sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 22:56:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Adjust inheritors and test

Browse Source
This commit is contained in:
ansel
2022-08-29 22:48:45 +03:00
parent 5343c26452
commit 545e0bbcef
3 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
View File

@ -3,12 +3,10 @@
#nullable disable
using osu.Framework.Bindables;
using osu.Framework.Extensions.LocalisationExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Localisation;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
@ -18,22 +16,17 @@ using osu.Game.Localisation;
namespace osu.Game.Overlays.Mods
{
public sealed class DifficultyMultiplierDisplay : ModsEffectDisplay, IHasCurrentValue<double>
public sealed class DifficultyMultiplierDisplay : ModsEffectDisplay<double>
{
protected override LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
public Bindable<double> Current
{
get => current.Current;
set => current.Current = value;
}
private readonly BindableNumberWithCurrent<double> current = new BindableNumberWithCurrent<double>(1);
protected override ModEffect CalculateEffect(double value) => CalculateForSign(value.CompareTo(1d));
private readonly MultiplierCounter multiplierCounter;
public DifficultyMultiplierDisplay()
{
Current.Default = 1d;
Current.Value = 1d;
Add(new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
@ -63,11 +56,9 @@ namespace osu.Game.Overlays.Mods
{
base.LoadComplete();
current.BindValueChanged(e => SetColours(e.NewValue.CompareTo(current.Default)), true);
// required to prevent the counter initially rolling up from 0 to 1
// due to `Current.Value` having a nonstandard default value of 1.
multiplierCounter.SetCountWithoutRolling(current.Value);
multiplierCounter.SetCountWithoutRolling(Current.Value);
}
private class MultiplierCounter : RollingCounter<double>