Invert spinnerNoBlink to spinnerBlink locally

This commit is contained in:
Max Hübner
2020-09-28 12:21:43 +02:00
parent 33d000e532
commit 40a4654ef9

View File

@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
private Sprite metreSprite; private Sprite metreSprite;
private Container metre; private Container metre;
private bool spinnerNoBlink; private bool spinnerBlink;
private const float sprite_scale = 1 / 1.6f; private const float sprite_scale = 1 / 1.6f;
private const float final_metre_height = 692 * sprite_scale; private const float final_metre_height = 692 * sprite_scale;
@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(ISkinSource source, DrawableHitObject drawableObject) private void load(ISkinSource source, DrawableHitObject drawableObject)
{ {
spinnerNoBlink = source.GetConfig<LegacySetting, bool>(LegacySetting.SpinnerNoBlink)?.Value ?? false; spinnerBlink = !source.GetConfig<LegacySetting, bool>(LegacySetting.SpinnerNoBlink)?.Value ?? true;
drawableSpinner = (DrawableSpinner)drawableObject; drawableSpinner = (DrawableSpinner)drawableObject;
@ -125,12 +125,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
progress *= 100; progress *= 100;
// the spinner should still blink at 100% progress. // the spinner should still blink at 100% progress.
if (!spinnerNoBlink) if (spinnerBlink)
progress = Math.Min(99, progress); progress = Math.Min(99, progress);
int barCount = (int)progress / 10; int barCount = (int)progress / 10;
if (!spinnerNoBlink && RNG.NextBool(((int)progress % 10) / 10f)) if (spinnerBlink && RNG.NextBool(((int)progress % 10) / 10f))
barCount++; barCount++;
return (float)barCount / total_bars * final_metre_height; return (float)barCount / total_bars * final_metre_height;