From 0442397213ef16da2df8e4f12e6f10275eff7e50 Mon Sep 17 00:00:00 2001 From: O Thiago Date: Sat, 24 Sep 2022 16:01:21 -0400 Subject: [PATCH] reimplement combo based size --- osu.Game/Rulesets/Mods/ModFlashlight.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs index e8c6406cef..b6100be58a 100644 --- a/osu.Game/Rulesets/Mods/ModFlashlight.cs +++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs @@ -115,6 +115,7 @@ namespace osu.Game.Rulesets.Mods private readonly float finalFlashlightDecreasing; private readonly float maximumChangeSizeComboReachedTimes; + private readonly bool comboBasedSize; private readonly int finalChangeSizeCombo; private readonly float changeSizeAfterHowManyCombo; @@ -124,6 +125,7 @@ namespace osu.Game.Rulesets.Mods { changeSizeAfterHowManyCombo = modFlashlight.ChangeSizeAfterHowManyCombo.Value; finalChangeSizeCombo = modFlashlight.FinalChangeSizeCombo.Value; + comboBasedSize = modFlashlight.ComboBasedSize.Value; finalFlashlightDecreasing = 1 - modFlashlight.FinalFlashlightSize.Value; appliedSize = modFlashlight.DefaultFlashlightSize * modFlashlight.SizeMultiplier.Value; @@ -163,6 +165,8 @@ namespace osu.Game.Rulesets.Mods protected float GetSizeFor(int combo) { + if (!comboBasedSize) return appliedSize; + int comboForSize = Math.Min(finalChangeSizeCombo, combo); float changeSizeComboReachedTimes = getChangeSizeComboReachedTimesForCombo(comboForSize);