h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 06:42:54 +08:00
Code Issues Releases Wiki Activity

Change bubble rewind removal to be in ApplyToDrawableHitObject method.

Browse Source
This commit is contained in:
mk56-spn 2023-02-14 18:06:43 +01:00
parent 92c61c7339
commit 5db624159b
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
View File

@ -55,12 +55,6 @@ namespace osu.Game.Rulesets.Osu.Mods
currentCombo.BindTo(scoreProcessor.Combo); currentCombo.BindTo(scoreProcessor.Combo);
currentCombo.BindValueChanged(combo => currentCombo.BindValueChanged(combo =>
maxSize = Math.Min(1.75f, (float)(1.25 + 0.005 * combo.NewValue)), true); maxSize = Math.Min(1.75f, (float)(1.25 + 0.005 * combo.NewValue)), true);
scoreProcessor.JudgementReverted += _ =>
{
bubbleContainer.LastOrDefault()?.ClearTransforms();
bubbleContainer.LastOrDefault()?.Expire();
};
} }
public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset) public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
@ -134,6 +128,16 @@ namespace osu.Game.Rulesets.Osu.Mods
} }
} }
}; };
drawableObject.OnRevertResult += (drawable, _) =>
{
if (drawable.HitObject is SpinnerTick or Slider) return;
BubbleDrawable? lastBubble = bubbleContainer.OfType<BubbleDrawable>().LastOrDefault();
lastBubble?.ClearTransforms();
lastBubble?.Expire();
};
} }
// Makes the slider border coloured on all skins (for aesthetics) // Makes the slider border coloured on all skins (for aesthetics)