h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:57:39 +08:00
Code Issues Releases Wiki Activity

Correct timings to match stable exactly + don't fade with hidden

Browse Source
This commit is contained in:
Adam 2023-02-15 00:45:58 -06:00
parent defe1fbf50
commit 5e774a28d8
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
View File

@ -36,6 +36,8 @@ namespace osu.Game.Rulesets.Osu.Mods
[SettingSource("Fade out hit circles earlier", "Make hit circles fade out into a miss, rather than after it.")]
public Bindable<bool> FadeHitCircleEarly { get; } = new Bindable<bool>(true);
private bool hiddenModActive;
public void ApplyToHitObject(HitObject hitObject)
{
switch (hitObject)
@ -56,6 +58,8 @@ namespace osu.Game.Rulesets.Osu.Mods
if (ClassicNoteLock.Value)
osuRuleset.Playfield.HitPolicy = new ObjectOrderedHitPolicy();
hiddenModActive = drawableRuleset.Mods.OfType<ModHidden>().Any();
}
public void ApplyToDrawableHitObject(DrawableHitObject obj)
@ -64,7 +68,7 @@ namespace osu.Game.Rulesets.Osu.Mods
{
case DrawableSliderHead head:
head.TrackFollowCircle = !NoSliderHeadMovement.Value;
if (FadeHitCircleEarly.Value)
if (FadeHitCircleEarly.Value && !hiddenModActive)
applyEarlyFading(head);
break;
@ -73,7 +77,7 @@ namespace osu.Game.Rulesets.Osu.Mods
break;
case DrawableHitCircle circle:
if (FadeHitCircleEarly.Value)
if (FadeHitCircleEarly.Value && !hiddenModActive)
applyEarlyFading(circle);
break;
}
@ -85,9 +89,9 @@ namespace osu.Game.Rulesets.Osu.Mods
{
using (o.BeginAbsoluteSequence(o.StateUpdateTime))
{
double mehWindow = o.HitObject.HitWindows.WindowFor(HitResult.Meh);
double lateMissFadeTime = mehWindow / 4 + 15;
o.Delay(mehWindow - lateMissFadeTime).FadeOut(lateMissFadeTime);
double okWindow = o.HitObject.HitWindows.WindowFor(HitResult.Ok);
double lateMissFadeTime = o.HitObject.HitWindows.WindowFor(HitResult.Meh) - okWindow;
o.Delay(okWindow).FadeOut(lateMissFadeTime);
}
};
}